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

Unified Diff: chrome/browser/ui/views/app_list/app_list_controller_win.cc

Issue 15715018: Make the Remove Extension dialog modal for win app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac fix Created 7 years, 7 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/app_list_controller_win.cc
diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
index 96a94709988d0f0d6da92161325b245d561059a9..5599cd211e33347a8922e578d5b69538b72a5a5c 100644
--- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc
+++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
@@ -311,6 +311,7 @@ class AppListController : public AppListServiceImpl {
virtual void DismissAppList() OVERRIDE;
virtual bool IsAppListVisible() const OVERRIDE;
virtual void EnableAppList() OVERRIDE;
+ virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
virtual AppListControllerDelegate* CreateControllerDelegate() OVERRIDE;
// AppListServiceImpl overrides:
@@ -409,8 +410,7 @@ void AppListControllerDelegateWin::ViewClosing() {
}
gfx::NativeWindow AppListControllerDelegateWin::GetAppListWindow() {
- app_list::AppListView* view = AppListController::GetInstance()->GetView();
- return view ? view->GetWidget()->GetNativeWindow() : NULL;
+ return AppListController::GetInstance()->GetAppListWindow();
}
gfx::ImageSkia AppListControllerDelegateWin::GetWindowIcon() {
@@ -483,6 +483,12 @@ AppListController::AppListController()
AppListController::~AppListController() {
}
+gfx::NativeWindow AppListController::GetAppListWindow() {
+ if (!IsAppListVisible())
+ return NULL;
+ return current_view_ ? current_view_->GetWidget()->GetNativeWindow() : NULL;
+}
+
AppListControllerDelegate* AppListController::CreateControllerDelegate() {
return new AppListControllerDelegateWin();
}

Powered by Google App Engine
This is Rietveld 408576698