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

Unified Diff: ash/shell_delegate.h

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month 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/shell/window_watcher.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_delegate.h
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 54156926d23e3714fb265ae6d64309fdc59fd10c..61e2eb020990bc12176bf99cf18e51f5f97fc211 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -42,15 +42,15 @@ class KeyboardControllerProxy;
namespace ash {
+class AccessibilityDelegate;
class CapsLockDelegate;
class LauncherDelegate;
-class LauncherModel;
struct LauncherItem;
class MediaDelegate;
class NewWindowDelegate;
class RootWindowHostFactory;
-class AccessibilityDelegate;
class SessionStateDelegate;
+class ShelfModel;
class SystemTrayDelegate;
class UserWallpaperDelegate;
@@ -152,8 +152,7 @@ class ASH_EXPORT ShellDelegate {
// Creates a new LauncherDelegate. Shell takes ownership of the returned
// value.
- virtual LauncherDelegate* CreateLauncherDelegate(
- ash::LauncherModel* model) = 0;
+ virtual LauncherDelegate* CreateLauncherDelegate(ShelfModel* model) = 0;
// Creates a system-tray delegate. Shell takes ownership of the delegate.
virtual SystemTrayDelegate* CreateSystemTrayDelegate() = 0;
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698