| Index: ash/launcher/launcher_model.cc
|
| diff --git a/ash/launcher/launcher_model.cc b/ash/launcher/launcher_model.cc
|
| index d9aa8adb3a618709f3763ca10b5ffb61b7be1ece..69017fdbbe1849c24c4098edfcf229b07d7da61c 100644
|
| --- a/ash/launcher/launcher_model.cc
|
| +++ b/ash/launcher/launcher_model.cc
|
| @@ -7,7 +7,6 @@
|
| #include <algorithm>
|
|
|
| #include "ash/launcher/launcher_model_observer.h"
|
| -#include "ui/aura/window.h"
|
|
|
| namespace ash {
|
|
|
| @@ -19,16 +18,18 @@ int LauncherItemTypeToWeight(LauncherItemType type) {
|
| return 0;
|
| case TYPE_APP_SHORTCUT:
|
| return 1;
|
| + case TYPE_APP_PLACEHOLDER:
|
| + return 2;
|
| case TYPE_TABBED:
|
| case TYPE_APP_PANEL:
|
| case TYPE_PLATFORM_APP:
|
| - return 2;
|
| - case TYPE_APP_LIST:
|
| return 3;
|
| + case TYPE_APP_LIST:
|
| + return 4;
|
| }
|
|
|
| NOTREACHED() << "Invalid type " << type;
|
| - return 2;
|
| + return 3;
|
| }
|
|
|
| bool CompareByWeight(const LauncherItem& a, const LauncherItem& b) {
|
|
|