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

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

Issue 2052013002: Adding ChromeLauncherController interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome_launcher_smaller_api
Patch Set: Rebase Created 4 years, 6 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
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..1245ad6f7958f3b3228bd2c2adbfe72b50a8edbd 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,21 @@ 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);
- if (!id)
- return false;
- return controller->IsOpen(id);
+ ash::ShelfID id =
+ ash::Shell::GetInstance()->GetShelfDelegate()->GetShelfIDForAppID(app_id);
+ return id && ChromeLauncherController::instance()->IsOpen(id);
}
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(
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_utils.cc ('k') | chrome/browser/ui/ash/app_list/app_list_service_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698