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

Unified Diff: ash/shelf/app_list_shelf_item_delegate.cc

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/launcher/launcher_unittest.cc ('k') | ash/shelf/overflow_bubble.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_shelf_item_delegate.cc
diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc
index affa767b700072910c2e54af339e7cf5d28c9769..b9fd49dae2d671744cb1b0a7824d3f03e6e8092b 100644
--- a/ash/shelf/app_list_shelf_item_delegate.cc
+++ b/ash/shelf/app_list_shelf_item_delegate.cc
@@ -4,7 +4,7 @@
#include "ash/shelf/app_list_shelf_item_delegate.h"
-#include "ash/launcher/launcher_model.h"
+#include "ash/shelf/shelf_model.h"
#include "ash/shell.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -15,7 +15,7 @@ namespace internal {
AppListShelfItemDelegate::AppListShelfItemDelegate() {
LauncherItem app_list;
app_list.type = TYPE_APP_LIST;
- Shell::GetInstance()->launcher_model()->Add(app_list);
+ Shell::GetInstance()->shelf_model()->Add(app_list);
}
AppListShelfItemDelegate::~AppListShelfItemDelegate() {
@@ -29,9 +29,9 @@ bool AppListShelfItemDelegate::ItemSelected(const ui::Event& event) {
}
base::string16 AppListShelfItemDelegate::GetTitle() {
- LauncherModel* model = Shell::GetInstance()->launcher_model();
+ ShelfModel* model = Shell::GetInstance()->shelf_model();
DCHECK(model);
- return model->status() == LauncherModel::STATUS_LOADING ?
+ return model->status() == ShelfModel::STATUS_LOADING ?
l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) :
l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE);
}
« no previous file with comments | « ash/launcher/launcher_unittest.cc ('k') | ash/shelf/overflow_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698