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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | ash/shell.h » ('J')
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 c204ccb5f3a5bb970820cff97280d567a0fefb20..d9af7b21ff790853d20c06c9d99ffc8cf26ffe9f 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,6 +99,7 @@ WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
wm_shell_common_->CreateMruWindowTracker();
accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
+ SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
}
WmShellMus::~WmShellMus() {
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/metrics/user_metrics_recorder.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698