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

Unified Diff: chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc

Issue 12224020: Use gfx::NativeView rather than gfx::NativeWindow to identify web contents modal dialogs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/web_contents_modal_dialog_manager_views.cc
diff --git a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
index b5371b4dd8bdfdb81af7389cd3b51ce44841d292..e52c8616d3e5696a3137ba92cd40f3fc5db3f03f 100644
--- a/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
+++ b/chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc
@@ -45,8 +45,8 @@ class NativeWebContentsModalDialogManagerViews
}
// NativeWebContentsModalDialogManager overrides
- virtual void ManageDialog(gfx::NativeWindow window) OVERRIDE {
- views::Widget* widget = GetWidget(window);
+ virtual void ManageDialog(gfx::NativeView view) OVERRIDE {
+ views::Widget* widget = GetWidget(view);
widget->AddObserver(this);
observed_widgets_.insert(widget);
widget->set_movement_disabled(true);
@@ -74,8 +74,8 @@ class NativeWebContentsModalDialogManagerViews
#endif
}
- virtual void CloseDialog(gfx::NativeWindow window) OVERRIDE {
- views::Widget* widget = GetWidget(window);
+ virtual void CloseDialog(gfx::NativeView view) OVERRIDE {
+ views::Widget* widget = GetWidget(view);
#if defined(USE_ASH)
gfx::NativeView view = platform_util::GetParent(widget->GetNativeView());
// Allow the parent to animate again.
@@ -92,8 +92,8 @@ class NativeWebContentsModalDialogManagerViews
}
private:
- static views::Widget* GetWidget(gfx::NativeWindow window) {
- views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
+ static views::Widget* GetWidget(gfx::NativeView view) {
+ views::Widget* widget = views::Widget::GetWidgetForNativeView(view);
DCHECK(widget);
return widget;
}

Powered by Google App Engine
This is Rietveld 408576698