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

Unified Diff: ash/launcher/launcher_model.cc

Issue 10905201: Move app list (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extra nl Created 8 years, 3 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
« no previous file with comments | « no previous file | ash/launcher/launcher_model_unittest.cc » ('j') | ash/launcher/launcher_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_model.cc
diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
index 7f6e113ff16f326a8774ce95d295e91c91cbc543..fd78301ded43a455bb35ede8edf3be0c4ebb0d46 100644
--- a/ash/launcher/launcher_model.cc
+++ b/ash/launcher/launcher_model.cc
@@ -14,15 +14,15 @@ namespace {
int LauncherItemTypeToWeight(LauncherItemType type) {
switch (type) {
- case TYPE_BROWSER_SHORTCUT:
+ case TYPE_APP_LIST:
return 0;
- case TYPE_APP_SHORTCUT:
+ case TYPE_BROWSER_SHORTCUT:
return 1;
+ case TYPE_APP_SHORTCUT:
+ return 2;
case TYPE_TABBED:
case TYPE_APP_PANEL:
case TYPE_PLATFORM_APP:
- return 2;
- case TYPE_APP_LIST:
return 3;
}
@@ -45,8 +45,8 @@ LauncherModel::LauncherModel() : next_id_(1), status_(STATUS_NORMAL) {
browser_shortcut.type = TYPE_BROWSER_SHORTCUT;
browser_shortcut.is_incognito = false;
- AddAt(0, browser_shortcut);
- AddAt(1, app_list);
+ AddAt(0, app_list);
+ AddAt(1, browser_shortcut);
}
LauncherModel::~LauncherModel() {
« no previous file with comments | « no previous file | ash/launcher/launcher_model_unittest.cc » ('j') | ash/launcher/launcher_model_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698