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

Unified Diff: chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc

Issue 12276010: Factor out uses of the WebContentsModalDialog interface from platform-independent code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove CloseWebContentsModalDialog call from ConstrainedWebDialogDelegateBase 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/gtk/constrained_web_dialog_delegate_gtk.cc
diff --git a/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc b/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
index 267a832a451b9ffdf17ce27c9ef0ff725206b11c..b21fbffd3e8fb31e1b18c9e7d0bfd386e49d6f79 100644
--- a/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
+++ b/chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
@@ -28,10 +28,6 @@ class ConstrainedWebDialogDelegateGtk : public ConstrainedWindowGtkDelegate,
virtual ~ConstrainedWebDialogDelegateGtk() {}
- void set_window(WebContentsModalDialog* dialog) {
- return impl_->set_window(dialog);
- }
-
// ConstrainedWebDialogDelegate interface
virtual const WebDialogDelegate*
GetWebDialogDelegate() const OVERRIDE {
@@ -46,8 +42,8 @@ class ConstrainedWebDialogDelegateGtk : public ConstrainedWindowGtkDelegate,
virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
return impl_->ReleaseWebContentsOnDialogClose();
}
- virtual WebContentsModalDialog* GetWindow() OVERRIDE {
- return impl_->GetWindow();
+ virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
+ return impl_->GetNativeWindow();
}
virtual WebContents* GetWebContents() OVERRIDE {
return impl_->GetWebContents();
@@ -99,8 +95,6 @@ ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
ConstrainedWebDialogDelegateGtk* constrained_delegate =
new ConstrainedWebDialogDelegateGtk(
browser_context, delegate, tab_delegate);
- WebContentsModalDialog* web_contents_modal_dialog =
- new ConstrainedWindowGtk(web_contents, constrained_delegate);
- constrained_delegate->set_window(web_contents_modal_dialog);
+ new ConstrainedWindowGtk(web_contents, constrained_delegate);
return constrained_delegate;
}

Powered by Google App Engine
This is Rietveld 408576698