Skip to content

Commit

Permalink
use weakptr vector in CloseAllWindows
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Apr 8, 2020
1 parent 39d92d9 commit 2556f97
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions shell/browser/window_list.cc
Expand Up @@ -14,9 +14,9 @@ namespace {
template <typename T>
std::vector<base::WeakPtr<T>> ConvertToWeakPtrVector(std::vector<T*> raw_ptrs) {
std::vector<base::WeakPtr<T>> converted_to_weak;
converted_to_weak.reserve(raw_ptrs.size());
for (auto* raw_ptr : raw_ptrs) {
base::WeakPtr<T> weak = raw_ptr->GetWeakPtr();
converted_to_weak.push_back(weak);
converted_to_weak.push_back(raw_ptr->GetWeakPtr());
}
return converted_to_weak;
}
Expand Down Expand Up @@ -92,21 +92,21 @@ void WindowList::RemoveObserver(WindowListObserver* observer) {

// static
void WindowList::CloseAllWindows() {
WindowVector windows = GetInstance()->windows_;
std::vector<base::WeakPtr<NativeWindow>> weak_windows =
ConvertToWeakPtrVector(GetInstance()->windows_);
#if defined(OS_MACOSX)
std::reverse(windows.begin(), windows.end());
std::reverse(weak_windows.begin(), weak_windows.end());
#endif
for (auto* const& window : windows) {
for (const auto& window : weak_windows) {
if (window && !window->IsClosed())
window->Close();
}
}

// static
void WindowList::DestroyAllWindows() {
WindowVector windows = GetInstance()->windows_;
std::vector<base::WeakPtr<NativeWindow>> weak_windows =
ConvertToWeakPtrVector(windows);
ConvertToWeakPtrVector(GetInstance()->windows_);

for (const auto& window : weak_windows) {
if (window)
Expand Down

0 comments on commit 2556f97

Please sign in to comment.