summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 05:16:02 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-07 05:16:02 +0000
commitf5f3c7576ee8867b562afe4c7e91820eea853730 (patch)
tree1bc99a1790b9ad2d4e66a5683c5f245b495856bb /chrome/app
parent9d9e7fa13a2adb5aa74eeff6e51651ff62205ab8 (diff)
downloadchromium_src-f5f3c7576ee8867b562afe4c7e91820eea853730.zip
chromium_src-f5f3c7576ee8867b562afe4c7e91820eea853730.tar.gz
chromium_src-f5f3c7576ee8867b562afe4c7e91820eea853730.tar.bz2
Reland 140878 - 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; - Fix broken ExtensionInstallUIBrowserTest.AppInstallConfirmation casued by wrong destruction order introduced by r140878 moving app list container on top of launcher container. Fix is to explicitly release app list contoller before launcher container. BUG=125964 TEST=Verify app list always show up as bubble and app_list_unittests should pass. Review URL: https://chromiumcodereview.appspot.com/10533032 TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10539038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 0d42c51..d2ab149 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5712,12 +5712,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION" desc="Description for the NaCl Socket API feature.">
Allows applications to use NaCl Socket API. Use only to test NaCl plugins.
</message>
- <message name="IDS_FLAGS_ENABLE_APPLIST_V2_NAME" desc="Name of the flag to enable applist v2 in ash.">
- Enable AppList v2.
- </message>
- <message name="IDS_FLAGS_ENABLE_APPLIST_V2_DESCRIPTION" desc="Description of the flag to enable applist v2 in ash.">
- Enables the bubble-style applist v2.
- </message>
<message name="IDS_FLAGS_EXPERIMENTAL_WALLPAPER_UI_NAME" desc="Name of the flag to enable experimental wallpaper picker ui in chromeos.">
Experimental Wallpaper UI.
</message>