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

Unified Diff: ash/shelf/shelf_view.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/shelf/shelf_tooltip_manager.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index 250ba3b7df93bac7330d835d7b1f51d1fc4d6fef..852e40336764765b11662d73b0a0e94b4d185667 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -35,8 +35,8 @@ class ShelfViewTestAPI;
class LauncherDelegate;
struct LauncherItem;
class LauncherItemDelegateManager;
-class LauncherModel;
class ShelfIconObserver;
+class ShelfModel;
namespace internal {
@@ -56,7 +56,7 @@ class ASH_EXPORT ShelfView : public views::View,
public views::BoundsAnimatorObserver,
public app_list::ApplicationDragAndDropHost {
public:
- ShelfView(LauncherModel* model,
+ ShelfView(ShelfModel* model,
LauncherDelegate* delegate,
ShelfLayoutManager* shelf_layout_manager);
virtual ~ShelfView();
@@ -65,7 +65,7 @@ class ASH_EXPORT ShelfView : public views::View,
ShelfLayoutManager* shelf_layout_manager() { return layout_manager_; }
- LauncherModel* model() { return model_; }
+ ShelfModel* model() { return model_; }
void Init();
@@ -318,7 +318,7 @@ class ASH_EXPORT ShelfView : public views::View,
int CalculateShelfDistance(const gfx::Point& coordinate) const;
// The model; owned by Launcher.
- LauncherModel* model_;
+ ShelfModel* model_;
// Delegate; owned by Launcher.
LauncherDelegate* delegate_;
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698