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

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2113053003: Moves Shell::maximize_mode_controller() to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 6 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
« no previous file with comments | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 55b34d6620f90e2766e1fc54937415053d444d6d..1e1aa3d87f9c011dc4eebc058fa3d30dae7c9d9e 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -97,6 +97,8 @@ WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
client_->AddObserver(this);
WmShell::Set(this);
+ CreateMaximizeModeController();
+
CreateMruWindowTracker();
accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
@@ -104,6 +106,11 @@ WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
}
WmShellMus::~WmShellMus() {
+ // This order mirrors that of Shell.
+
+ // Destroy maximize mode controller early on since it has some observers which
+ // need to be removed.
+ DeleteMaximizeModeController();
DeleteSystemTrayDelegate();
DeleteWindowSelectorController();
DeleteMruWindowTracker();
« no previous file with comments | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698