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

Unified Diff: ash/shell.h

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: link chrome Created 7 years 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/shelf/shelf_view_unittest.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 864bc866ed0cc785c5930c86187052a0769630ae..636d9c08d6e03b4b512e21dcfabfd33fcea2c1c7 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -86,8 +86,6 @@ class FirstRunHelper;
class HighContrastController;
class Launcher;
class LauncherDelegate;
-class LauncherItemDelegate;
-class LauncherItemDelegateManager;
class LockStateController;
class MagnificationController;
class MediaDelegate;
@@ -99,6 +97,7 @@ class PowerButtonController;
class RootWindowHostFactory;
class ScreenAsh;
class SessionStateDelegate;
+class ShelfItemDelegateManager;
class ShelfModel;
class ShellDelegate;
class ShellObserver;
@@ -408,8 +407,8 @@ class ASH_EXPORT Shell
return activation_client_;
}
- LauncherItemDelegateManager* launcher_item_delegate_manager() {
- return launcher_item_delegate_manager_.get();
+ ShelfItemDelegateManager* shelf_item_delegate_manager() {
+ return shelf_item_delegate_manager_.get();
}
ScreenAsh* screen() { return screen_; }
@@ -601,7 +600,7 @@ class ASH_EXPORT Shell
scoped_ptr<NewWindowDelegate> new_window_delegate_;
scoped_ptr<MediaDelegate> media_delegate_;
scoped_ptr<LauncherDelegate> launcher_delegate_;
- scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
+ scoped_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
scoped_ptr<ShelfModel> shelf_model_;
scoped_ptr<WindowPositioner> window_positioner_;
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698