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

Unified Diff: chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

Issue 262643003: Revert of Refactor views app list services to allow more code sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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/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 4b215172486cf137fa0fdd8e6ab9f6eab45edb80..222f4c705e5c8ac2b9518d494e0ca1dea9eb23df 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,15 +7,17 @@
#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(
- AppListServiceViews* service)
- : AppListControllerDelegateViews(service) {}
+ AppListServiceWin* service)
+ : AppListControllerDelegateImpl(service),
+ service_(service) {}
AppListControllerDelegateWin::~AppListControllerDelegateWin() {}
@@ -23,10 +25,26 @@
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) {

Powered by Google App Engine
This is Rietveld 408576698