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

Unified Diff: ash/common/shell_delegate.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: Move factory ownership to WindowManagerApplication; to match AuraInit/ViewsDelegate. 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
Index: ash/common/shell_delegate.h
diff --git a/ash/common/shell_delegate.h b/ash/common/shell_delegate.h
index 9a46959ecfdb8c237ffe439989505d12bca1ea28..ef0b434a63cb0681ecf63a7ec0d4392c6f61e691 100644
--- a/ash/common/shell_delegate.h
+++ b/ash/common/shell_delegate.h
@@ -46,8 +46,8 @@ class SessionStateDelegate;
class ShelfDelegate;
class ShelfModel;
class SystemTrayDelegate;
-class UserWallpaperDelegate;
struct ShelfItem;
+class WallpaperDelegate;
class WmShelf;
class WmWindow;
@@ -108,8 +108,8 @@ class ASH_EXPORT ShellDelegate {
// Creates a system-tray delegate. Shell takes ownership of the delegate.
virtual SystemTrayDelegate* CreateSystemTrayDelegate() = 0;
- // Creates a user wallpaper delegate. Shell takes ownership of the delegate.
- virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() = 0;
+ // Creates a wallpaper delegate. Shell takes ownership of the delegate.
+ virtual WallpaperDelegate* CreateWallpaperDelegate() = 0;
James Cook 2016/08/25 16:59:57 Return std::unique_ptr<> instead?
msw 2016/08/25 18:27:06 Done.
// Creates a session state delegate. Shell takes ownership of the delegate.
virtual SessionStateDelegate* CreateSessionStateDelegate() = 0;

Powered by Google App Engine
This is Rietveld 408576698