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

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

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback 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
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 c204ccb5f3a5bb970820cff97280d567a0fefb20..7b58f177f6e186cb8f2c2196d53feb516667d029 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -8,6 +8,7 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_observer.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/system/tray/default_system_tray_delegate.h"
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_activation_observer.h"
@@ -98,9 +99,11 @@ WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
wm_shell_common_->CreateMruWindowTracker();
accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
+ SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
}
WmShellMus::~WmShellMus() {
+ SetSystemTrayDelegate(nullptr);
wm_shell_common_->DeleteMruWindowTracker();
RemoveClientObserver();
WmShell::Set(nullptr);

Powered by Google App Engine
This is Rietveld 408576698