Index: chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc |
diff --git a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc |
index 222f4c705e5c8ac2b9518d494e0ca1dea9eb23df..4b215172486cf137fa0fdd8e6ab9f6eab45edb80 100644 |
--- a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc |
+++ b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc |
@@ -7,17 +7,15 @@ |
#include "apps/app_window.h" |
#include "apps/app_window_registry.h" |
#include "chrome/browser/metro_utils/metro_chrome_win.h" |
+#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/app_list/app_list_icon_win.h" |
#include "chrome/browser/ui/extensions/application_launch.h" |
#include "chrome/browser/ui/host_desktop.h" |
-#include "chrome/browser/ui/views/app_list/win/app_list_service_win.h" |
-#include "extensions/common/extension.h" |
#include "ui/base/resource/resource_bundle.h" |
AppListControllerDelegateWin::AppListControllerDelegateWin( |
- AppListServiceWin* service) |
- : AppListControllerDelegateImpl(service), |
- service_(service) {} |
+ AppListServiceViews* service) |
+ : AppListControllerDelegateViews(service) {} |
AppListControllerDelegateWin::~AppListControllerDelegateWin() {} |
@@ -25,28 +23,12 @@ bool AppListControllerDelegateWin::ForceNativeDesktop() const { |
return true; |
} |
-void AppListControllerDelegateWin::ViewClosing() { |
- service_->OnViewBeingDestroyed(); |
-} |
- |
gfx::ImageSkia AppListControllerDelegateWin::GetWindowIcon() { |
gfx::ImageSkia* resource = ResourceBundle::GetSharedInstance(). |
GetImageSkiaNamed(GetAppListIconResourceId()); |
return *resource; |
} |
-void AppListControllerDelegateWin::OnShowExtensionPrompt() { |
- service_->set_can_close(false); |
-} |
- |
-void AppListControllerDelegateWin::OnCloseExtensionPrompt() { |
- service_->set_can_close(true); |
-} |
- |
-bool AppListControllerDelegateWin::CanDoCreateShortcutsFlow() { |
- return true; |
-} |
- |
void AppListControllerDelegateWin::FillLaunchParams(AppLaunchParams* params) { |
params->desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; |
apps::AppWindow* any_existing_window = |