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

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

Issue 12286014: Factor out uses of WebContentsModalDialog interface functions from WebContentsModalDialogManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test failure 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 2f311aa6bff85aa734a530d537927bf20f5875cb..3d3fc1d8967f31ef14f5454eba22c4e81cc9508e 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
@@ -74,6 +74,10 @@ class NativeWebContentsModalDialogManagerViews
#endif
}
+ virtual void ShowDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
+ return GetConstrainedWindowViews(dialog)->ShowWebContentsModalDialog();
+ }
+
virtual void CloseDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
views::Widget* widget = GetWidget(dialog);
#if defined(USE_ASH)
@@ -85,6 +89,14 @@ class NativeWebContentsModalDialogManagerViews
widget->Close();
}
+ virtual void FocusDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
+ return GetConstrainedWindowViews(dialog)->FocusWebContentsModalDialog();
+ }
+
+ virtual void PulseDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
+ return GetConstrainedWindowViews(dialog)->PulseWebContentsModalDialog();
+ }
+
// views::WidgetObserver overrides
virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
native_delegate_->WillClose(static_cast<ConstrainedWindowViews*>(widget));
@@ -98,6 +110,11 @@ class NativeWebContentsModalDialogManagerViews
return widget;
}
+ static ConstrainedWindowViews* GetConstrainedWindowViews(
+ NativeWebContentsModalDialog dialog) {
+ return static_cast<ConstrainedWindowViews*>(GetWidget(dialog));
+ }
+
NativeWebContentsModalDialogManagerDelegate* native_delegate_;
std::set<views::Widget*> observed_widgets_;
« no previous file with comments | « chrome/browser/ui/native_web_contents_modal_dialog_manager.h ('k') | chrome/browser/ui/web_contents_modal_dialog_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698