Chromium Code Reviews| 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 aada31591efd10dde0c6ca63f3e0307d446e72ec..87be8c47855f233d4df204369e76c7e161377d69 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 |
| @@ -5,7 +5,6 @@ |
| #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" |
| #include "ash/shell.h" |
| -#include "chrome/browser/ui/app_list/app_list_util.h" |
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| AppListControllerDelegateAsh::AppListControllerDelegateAsh() {} |
| @@ -65,36 +64,26 @@ void AppListControllerDelegateAsh::LaunchApp( |
| DismissView(); |
| } |
| -namespace chrome { |
| +void AppListServiceAsh::GetInstance() { |
| + return Singleton<AppListServiceAsh>::get(); |
| +} |
| -// In the win_aura build these are defined in app_list_controller_win.cc. |
| -void ShowAppList(Profile* default_profile) { |
| +void AppListServiceAsh::ShowAppList(Profile* default_profile) { |
| ash::Shell::GetInstance()->ToggleAppList(NULL); |
| } |
| -bool IsAppListVisible() { |
| +bool AppListServiceAsh::IsAppListVisible() { |
| return ash::Shell::GetInstance()->GetAppListWindow() != NULL; |
| } |
| -void DismissAppList() { |
| +void AppListServiceAsh::DismissAppList() { |
| if (IsAppListVisible()) |
| ash::Shell::GetInstance()->ToggleAppList(NULL); |
| } |
| -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) { |
| +#if !defined(OS_WIN) |
|
tapted
2013/02/11 04:04:20
actually (is) defined(OS_CHROMEOS) is probably bet
tapted
2013/02/18 07:05:39
(deprecated comment)
|
| +// static |
| +AppListService* AppListService::Get() { |
| + return AppListServiceAsh::GetInstance(); |
| } |
| - |
| -void NotifyAppListOfDownloadProgress( |
| - Profile* profile, |
| - const std::string& extension_id, |
| - int percent_downloaded) { |
| -} |
| - |
| -} // namespace chrome |
| +#endif |