| Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
|
| 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 73d1abd6ab33c292b84e7888227a3149c1b142c0..ad730c6d251a18ee88143aaf636b54c01bf4c60b 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
|
| @@ -70,7 +70,8 @@ namespace chrome {
|
|
|
| // In the win_aura build these are defined in app_list_controller_win.cc.
|
| void ShowAppList(Profile* default_profile) {
|
| - ash::Shell::GetInstance()->ToggleAppList(NULL);
|
| + if (!ash::Shell::GetInstance()->GetAppListTargetVisibility())
|
| + ash::Shell::GetInstance()->ToggleAppList(NULL);
|
| }
|
|
|
| bool IsAppListVisible() {
|
| @@ -85,23 +86,5 @@ void DismissAppList() {
|
| void SetAppListProfile(const base::FilePath& profile_file_path) {
|
| }
|
|
|
| -void NotifyAppListOfBeginExtensionInstall(
|
| - Profile* profile,
|
| - const std::string& extension_id,
|
| - const std::string& extension_name,
|
| - const gfx::ImageSkia& installing_icon) {
|
| -}
|
| -
|
| -void NotifyAppListOfDownloadProgress(
|
| - Profile* profile,
|
| - const std::string& extension_id,
|
| - int percent_downloaded) {
|
| -}
|
| -
|
| -void NotifyAppListOfExtensionInstallFailure(
|
| - Profile* profile,
|
| - const std::string& extension_id) {
|
| -}
|
| -
|
| } // namespace chrome
|
| #endif
|
|
|