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 2f5e1182b1355c4732307a9e6f0579d741aa9079..6337a7bc69f35950e286f21cb75edb9f058e89b8 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,6 +5,7 @@ |
| #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" |
| #include "ash/metrics/task_switch_metrics_recorder.h" |
| +#include "ash/shelf/shelf_delegate.h" |
| #include "ash/shell.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
| @@ -37,23 +38,23 @@ gfx::Rect AppListControllerDelegateAsh::GetAppListBounds() { |
| } |
| bool AppListControllerDelegateAsh::IsAppPinned(const std::string& app_id) { |
| - return ChromeLauncherController::instance()->IsAppPinned(app_id); |
| + return ash::Shell::GetInstance()->GetShelfDelegate()->IsAppPinned(app_id); |
| } |
| bool AppListControllerDelegateAsh::IsAppOpen(const std::string& app_id) const { |
| - ChromeLauncherController* controller = ChromeLauncherController::instance(); |
| - ash::ShelfID id = controller->GetShelfIDForAppID(app_id); |
| + ash::ShelfID id = |
| + ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(app_id); |
| if (!id) |
| return false; |
| - return controller->IsOpen(id); |
| + return ChromeLauncherController::instance()->IsOpen(id); |
|
msw
2016/06/10 22:44:38
optional nit: |return id && ...| to combine with t
mfomitchev
2016/06/13 17:29:17
Done.
|
| } |
| void AppListControllerDelegateAsh::PinApp(const std::string& app_id) { |
| - ChromeLauncherController::instance()->PinAppWithID(app_id); |
| + ash::Shell::GetInstance()->GetShelfDelegate()->PinAppWithID(app_id); |
| } |
| void AppListControllerDelegateAsh::UnpinApp(const std::string& app_id) { |
| - ChromeLauncherController::instance()->UnpinAppWithID(app_id); |
| + ash::Shell::GetInstance()->GetShelfDelegate()->UnpinAppWithID(app_id); |
| } |
| AppListControllerDelegate::Pinnable AppListControllerDelegateAsh::GetPinnable( |