diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 23:17:44 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 23:17:44 +0000 |
| commit | 1672d9edc9bdc60abdd4c9a7ff942973f4f7941f (patch) | |
| tree | 0c9eaf8c12a7e530377dc05290efe92ce078e9de /ash/shell.cc | |
| parent | 782388a4268cd2543ed6f88a01100fc00f2b0293 (diff) | |
| download | chromium_src-1672d9edc9bdc60abdd4c9a7ff942973f4f7941f.zip chromium_src-1672d9edc9bdc60abdd4c9a7ff942973f4f7941f.tar.gz chromium_src-1672d9edc9bdc60abdd4c9a7ff942973f4f7941f.tar.bz2 | |
cleanup: Remove applist v1 code.
- Remove obsolete v1 code and test;
- Grid rid of selected_ in AppListItemModel and solely use selected_item_index_
in AppsGridView;
- Fix a bug that highlighted item might not be visible and add test to cover it;
- Update DEPS;
BUG=125964
TEST=Verify app list always show up as bubble and app_list_unittests should pass.
Review URL: https://chromiumcodereview.appspot.com/10533032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 1da2922..858cbfa 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -173,24 +173,13 @@ void CreateSpecialContainers(aura::RootWindow* root_window) { "PanelContainer", non_lock_screen_containers); - // V1 Applist container is below launcher container. - bool use_v2_applist = internal::AppListController::UseAppListV2(); - if (!use_v2_applist) { - CreateContainer(internal::kShellWindowId_AppListContainer, - "AppListContainer", - non_lock_screen_containers); - } - CreateContainer(internal::kShellWindowId_LauncherContainer, "LauncherContainer", non_lock_screen_containers); - // V2 Applist container is above launcher container. - if (use_v2_applist) { - CreateContainer(internal::kShellWindowId_AppListContainer, - "AppListContainer", - non_lock_screen_containers); - } + CreateContainer(internal::kShellWindowId_AppListContainer, + "AppListContainer", + non_lock_screen_containers); aura::Window* modal_container = CreateContainer( internal::kShellWindowId_SystemModalContainer, |