summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_model.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/launcher/launcher_model.cc')
-rw-r--r--ash/launcher/launcher_model.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
index 9607de6..e82e8de 100644
--- a/ash/launcher/launcher_model.cc
+++ b/ash/launcher/launcher_model.cc
@@ -22,11 +22,13 @@ int LauncherItemTypeToWeight(LauncherItemType type) {
case TYPE_APP_SHORTCUT:
case TYPE_WINDOWED_APP:
return 1;
- case TYPE_TABBED:
case TYPE_PLATFORM_APP:
return 2;
case TYPE_APP_PANEL:
return 3;
+ case TYPE_UNDEFINED:
+ NOTREACHED() << "LauncherItemType must be set";
+ return -1;
}
} else {
switch (type) {
@@ -34,13 +36,15 @@ int LauncherItemTypeToWeight(LauncherItemType type) {
case TYPE_APP_SHORTCUT:
case TYPE_WINDOWED_APP:
return 0;
- case TYPE_TABBED:
case TYPE_PLATFORM_APP:
return 1;
case TYPE_APP_LIST:
return 2;
case TYPE_APP_PANEL:
return 3;
+ case TYPE_UNDEFINED:
+ NOTREACHED() << "LauncherItemType must be set";
+ return -1;
}
}
@@ -57,7 +61,6 @@ bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
LauncherModel::LauncherModel() : next_id_(1), status_(STATUS_NORMAL) {
LauncherItem app_list;
app_list.type = TYPE_APP_LIST;
- app_list.is_incognito = false;
AddAt(0, app_list);
}