Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3569)

Unified Diff: ash/wm/mru_window_tracker.cc

Issue 2861243003: chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager (Closed)
Patch Set: moar Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/mru_window_tracker.cc
diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc
index dcc8ad49290b9aa8c65d05299f4db3fa89d1c930..c44c1755fc5b0be63623e561145cff224f408033 100644
--- a/ash/wm/mru_window_tracker.cc
+++ b/ash/wm/mru_window_tracker.cc
@@ -76,7 +76,8 @@ MruWindowTracker::WindowList BuildWindowListInternal(
for (auto ix = mru_windows->rbegin(); ix != mru_windows->rend(); ++ix) {
// Exclude windows in non-switchable containers and those which cannot
// be activated.
- if (!wm::IsSwitchableContainer((*ix)->GetParent()) ||
+ if (((*ix)->GetParent() &&
+ !wm::IsSwitchableContainer((*ix)->GetParent()->aura_window())) ||
!should_include_window_predicate.Run(*ix)) {
continue;
}

Powered by Google App Engine
This is Rietveld 408576698