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

Unified Diff: ash/accelerators/accelerator_controller.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
« no previous file with comments | « no previous file | ash/first_run/first_run_helper_impl.cc » ('j') | ash/shelf/app_list_shelf_item_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 289c4d56df089f3f6a4fee06b14fa9333e01bb47..1963c199311f408ea580cc6652c2965fd5d03c8a 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -485,7 +485,10 @@ bool HandleToggleAppList(ui::KeyboardCode key_code,
if (Shell::GetInstance()->accessibility_delegate()->
IsSpokenFeedbackEnabled())
return false;
- ash::Shell::GetInstance()->ToggleAppList(NULL);
+ if (ash::Shell::GetInstance()->GetAppListTargetVisibility())
Matt Giuca 2014/08/14 04:17:06 I think it would be good to preserve ToggleAppList
calamity 2014/08/14 05:00:59 Done.
+ ash::Shell::GetInstance()->DismissAppList();
+ else
+ ash::Shell::GetInstance()->ShowAppList(NULL);
return true;
}
« no previous file with comments | « no previous file | ash/first_run/first_run_helper_impl.cc » ('j') | ash/shelf/app_list_shelf_item_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698