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

Unified Diff: ash/mus/shell_delegate_mus.h

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Sync and rebase. Created 3 years, 8 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/mus/shell_delegate_mus.h
diff --git a/ash/mus/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h
index c66ac31f62b9704ccb8e11a397f47ba7aa8a04be..f96f23eaee7ebeb150ab901afc8feb9077ead812 100644
--- a/ash/mus/shell_delegate_mus.h
+++ b/ash/mus/shell_delegate_mus.h
@@ -33,7 +33,8 @@ class ShellDelegateMus : public ShellDelegate {
void Exit() override;
keyboard::KeyboardUI* CreateKeyboardUI() override;
void OpenUrlFromArc(const GURL& url) override;
- ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
+ void ShelfInit() override;
+ void ShelfShutdown() override;
SystemTrayDelegate* CreateSystemTrayDelegate() override;
std::unique_ptr<WallpaperDelegate> CreateWallpaperDelegate() override;
SessionStateDelegate* CreateSessionStateDelegate() override;

Powered by Google App Engine
This is Rietveld 408576698