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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

Issue 460933002: Split Shell::ToggleAppList() into ShowAppList and DismissAppList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments 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/shell.h ('K') | « chrome/browser/ui/ash/app_list/app_list_controller_ash.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/app_list/app_list_service_ash.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
index 58eb99b5d10b8037589551f9d1f34ca2447f8040..59f599a75d02236193745cc47178f8f7d55eda14 100644
--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc
@@ -35,8 +35,7 @@ void AppListServiceAsh::ShowForProfile(Profile* default_profile) {
// This may not work correctly if the profile passed in is different from the
// one the ash Shell is currently using.
// TODO(ananta): Handle profile changes correctly when !defined(OS_CHROMEOS).
- if (!ash::Shell::GetInstance()->GetAppListTargetVisibility())
- ash::Shell::GetInstance()->ToggleAppList(NULL);
+ ash::Shell::GetInstance()->ShowAppList(NULL);
}
bool AppListServiceAsh::IsAppListVisible() const {
@@ -44,8 +43,7 @@ bool AppListServiceAsh::IsAppListVisible() const {
}
void AppListServiceAsh::DismissAppList() {
- if (IsAppListVisible())
- ash::Shell::GetInstance()->ToggleAppList(NULL);
+ ash::Shell::GetInstance()->DismissAppList();
}
void AppListServiceAsh::EnableAppList(Profile* initial_profile,
« ash/shell.h ('K') | « chrome/browser/ui/ash/app_list/app_list_controller_ash.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698