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

Unified Diff: ash/common/wm_shell.h

Issue 2060633002: mash: Introduce WmSystemTrayNotifier for //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@testupdate
Patch Set: rebase 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/common/system/tray/wm_system_tray_notifier.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index b064ec0b859d452d2553ddca15e90fb8319abfaf..6add8fbb80d1588a3ff1bd6b3d0465cea72a7299 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -26,6 +26,7 @@ class SystemTrayDelegate;
class WindowResizer;
class WmActivationObserver;
class WmDisplayObserver;
+class WmSystemTrayNotifier;
class WmWindow;
namespace wm {
@@ -44,6 +45,10 @@ class ASH_EXPORT WmShell {
static WmShell* Get();
static bool HasInstance() { return instance_ != nullptr; }
+ WmSystemTrayNotifier* system_tray_notifier() {
+ return system_tray_notifier_.get();
+ }
+
SystemTrayDelegate* system_tray_delegate() {
return system_tray_delegate_.get();
}
@@ -132,6 +137,7 @@ class ASH_EXPORT WmShell {
static WmShell* instance_;
+ std::unique_ptr<WmSystemTrayNotifier> system_tray_notifier_;
std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
};
« no previous file with comments | « ash/common/system/tray/wm_system_tray_notifier.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698