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

Unified Diff: ash/shell.h

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 4 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/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index b11e850e16999ae52b1bfe36c7591324ca4baff3..cc5fd584598353f149d78e4b65ded4a95301a441 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -127,7 +127,6 @@ class SystemTray;
class ToplevelWindowEventHandler;
class TouchTransformerController;
class TouchObserverHUD;
-class UserWallpaperDelegate;
class VirtualKeyboardController;
class VideoActivityNotifier;
class VideoDetector;
@@ -315,10 +314,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
}
::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); }
- UserWallpaperDelegate* user_wallpaper_delegate() {
- return user_wallpaper_delegate_.get();
- }
-
SessionStateDelegate* session_state_delegate() {
return session_state_delegate_.get();
}
@@ -496,7 +491,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
std::unique_ptr<AcceleratorControllerDelegateAura>
accelerator_controller_delegate_;
- std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
std::unique_ptr<WindowPositioner> window_positioner_;
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698