diff options
| author | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 17:31:32 +0000 |
|---|---|---|
| committer | scottmg@google.com <scottmg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 17:31:32 +0000 |
| commit | 8586bb293312a4b6ed635ac4879cfbd7a2913f6a (patch) | |
| tree | 66efe3ab7e91627980b6c1cfc7a8e13311c98005 /chrome/browser/ui/ash/app_list | |
| parent | 237c77446f539d8b8328dbf9416fc034f52c122b (diff) | |
| download | chromium_src-8586bb293312a4b6ed635ac4879cfbd7a2913f6a.zip chromium_src-8586bb293312a4b6ed635ac4879cfbd7a2913f6a.tar.gz chromium_src-8586bb293312a4b6ed635ac4879cfbd7a2913f6a.tar.bz2 | |
don't toggle the app list unless there's a shell instance
On win aura, we have USE_ASH, but not necessarily a Shell instance.
R=kalman@chromium.org
TEST=browser_tests on win_aura, ExtensionInstallUIBrowserTest.AppInstallConfirmation*
Review URL: https://codereview.chromium.org/11414121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/ash/app_list')
| -rw-r--r-- | chrome/browser/ui/ash/app_list/app_list_controller_ash.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc index 640373c..883fdcd 100644 --- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc +++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc @@ -58,3 +58,13 @@ void AppListControllerDelegateAsh::LaunchApp(Profile* profile, ChromeLauncherController::instance()->LaunchApp(extension_id, event_flags); CloseView(); } + +namespace app_list_controller { + +#if defined(OS_CHROMEOS) +void ShowAppList() { + ash::Shell::GetInstance()->ToggleAppList(); +} +#endif + +} |