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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/app_list_shelf_item_delegate.cc

Issue 460933002: Split Shell::ToggleAppList() into ShowAppList and DismissAppList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« ash/accelerators/accelerator_controller.cc ('K') | « ash/first_run/first_run_helper_impl.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/shelf/shelf_layout_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_shelf_item_delegate.cc
diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc
index 71e0007b817d083eece1d348ee3d3bc262c60785..71fbe90050ed57e0c7784b3558b5d69c84b71a70 100644
--- a/ash/shelf/app_list_shelf_item_delegate.cc
+++ b/ash/shelf/app_list_shelf_item_delegate.cc
@@ -24,7 +24,10 @@ AppListShelfItemDelegate::~AppListShelfItemDelegate() {
bool AppListShelfItemDelegate::ItemSelected(const ui::Event& event) {
// Pass NULL here to show the app list in the currently active RootWindow.
- Shell::GetInstance()->ToggleAppList(NULL);
+ if (Shell::GetInstance()->GetAppListTargetVisibility())
Matt Giuca 2014/08/14 04:17:07 ... here's the second one.
calamity 2014/08/14 05:00:59 Done.
+ Shell::GetInstance()->DismissAppList();
+ else
+ Shell::GetInstance()->ShowAppList(NULL);
return false;
}
« ash/accelerators/accelerator_controller.cc ('K') | « ash/first_run/first_run_helper_impl.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | ash/shelf/shelf_layout_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698