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

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

Issue 2116153002: Initialize DBus in mojo:ash on chrome os (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, move init later Created 4 years, 5 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/mus/BUILD.gn ('k') | ash/mus/window_manager_application.cc » ('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 6c42ca318b2511a8f6fbb49a1166f872ad9a3647..582e75000da983f3d73a1f2246e655e823cc131f 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -99,6 +99,8 @@ WmShellMus::WmShellMus(ShellDelegate* delegate, ::ui::WindowTreeClient* client)
client_->AddObserver(this);
WmShell::Set(this);
+ CreateMaximizeModeController();
+
CreateMruWindowTracker();
accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
@@ -108,6 +110,9 @@ WmShellMus::WmShellMus(ShellDelegate* delegate, ::ui::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/mus/BUILD.gn ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698