| 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 a736d3a2f4ffb521c1ad8ab7cfd9a96028acf357..de74b1ac2b968ca6cd26a5892224ae4805e154ff 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
|
| @@ -7,41 +7,38 @@
|
| #include "ash/shell.h"
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
|
|
|
| -AppListControllerAsh::AppListControllerAsh() {}
|
| +AppListControllerDelegateAsh::AppListControllerDelegateAsh() {}
|
|
|
| -AppListControllerAsh::~AppListControllerAsh() {}
|
| +AppListControllerDelegateAsh::~AppListControllerDelegateAsh() {}
|
|
|
| -void AppListControllerAsh::CloseView() {
|
| +void AppListControllerDelegateAsh::CloseView() {
|
| DCHECK(ash::Shell::HasInstance());
|
| if (ash::Shell::GetInstance()->GetAppListTargetVisibility())
|
| ash::Shell::GetInstance()->ToggleAppList();
|
| }
|
|
|
| -bool AppListControllerAsh::IsAppPinned(const std::string& extension_id) {
|
| +bool AppListControllerDelegateAsh::IsAppPinned(
|
| + const std::string& extension_id) {
|
| return ChromeLauncherController::instance()->IsAppPinned(extension_id);
|
| }
|
|
|
| -void AppListControllerAsh::PinApp(const std::string& extension_id) {
|
| +void AppListControllerDelegateAsh::PinApp(const std::string& extension_id) {
|
| ChromeLauncherController::instance()->PinAppWithID(extension_id);
|
| }
|
|
|
| -void AppListControllerAsh::UnpinApp(const std::string& extension_id) {
|
| +void AppListControllerDelegateAsh::UnpinApp(const std::string& extension_id) {
|
| ChromeLauncherController::instance()->UnpinAppsWithID(extension_id);
|
| }
|
|
|
| -bool AppListControllerAsh::CanPin() {
|
| +bool AppListControllerDelegateAsh::CanPin() {
|
| return ChromeLauncherController::instance()->CanPin();
|
| }
|
|
|
| -bool AppListControllerAsh::CanShowCreateShortcutsDialog() {
|
| +bool AppListControllerDelegateAsh::CanShowCreateShortcutsDialog() {
|
| return false;
|
| }
|
|
|
| -void AppListControllerAsh::ShowCreateShortcutsDialog(
|
| - Profile* profile,
|
| - const std::string& extension_id) {}
|
| -
|
| -void AppListControllerAsh::ActivateApp(Profile* profile,
|
| +void AppListControllerDelegateAsh::ActivateApp(Profile* profile,
|
| const std::string& extension_id,
|
| int event_flags) {
|
| ChromeLauncherController::instance()->OpenAppID(extension_id,
|
|
|