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

Unified Diff: ash/shell.h

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
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 6aff8bcc1d77d75b5e6ff611317a9aa03e4b1246..6e190e40106ae7d75a3c8cbb1e5a4796b1b95d31 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -495,10 +495,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// Returns the system tray on primary display.
SystemTray* GetPrimarySystemTray();
- SystemTrayDelegate* system_tray_delegate() {
- return system_tray_delegate_.get();
- }
-
SystemTrayNotifier* system_tray_notifier() {
return system_tray_notifier_.get();
}
@@ -665,7 +661,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
std::unique_ptr<AcceleratorController> accelerator_controller_;
std::unique_ptr<ShellDelegate> delegate_;
- std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;

Powered by Google App Engine
This is Rietveld 408576698