From fe6db3f9cfa549099fef012195aaae3944b0199a Mon Sep 17 00:00:00 2001 From: "wittman@chromium.org" Date: Thu, 14 Mar 2013 15:55:54 +0000 Subject: Remove ConstrainedWindowGtk::CloseWebContentsModalDialog() Part 1/5 of the Gtk ContstrainedWindow API rework towards removing ConstrainedWindowGtk in favor of using a native Widget. Clean up some unnecessry functions/members in ConstrainedWindowGtk and replace calls to CloseWebContentsModalDialog() with gtk_widget_destroy(). BUG=157161 Review URL: https://chromiumcodereview.appspot.com/12827004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188089 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/gtk/constrained_window_gtk.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'chrome/browser/ui/gtk/constrained_window_gtk.h') diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h index 47fadd7..90851b2 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.h +++ b/chrome/browser/ui/gtk/constrained_window_gtk.h @@ -35,9 +35,6 @@ class ConstrainedWindowGtkDelegate { virtual bool GetBackgroundColor(GdkColor* color); - // Returns true if hosting ConstrainedWindowGtk should apply default padding. - virtual bool ShouldHaveBorderPadding() const; - protected: virtual ~ConstrainedWindowGtkDelegate(); }; @@ -54,24 +51,17 @@ class ConstrainedWindowGtk { virtual ~ConstrainedWindowGtk(); void ShowWebContentsModalDialog(); - void CloseWebContentsModalDialog(); void FocusWebContentsModalDialog(); void PulseWebContentsModalDialog(); NativeWebContentsModalDialog GetNativeDialog(); - // Called when the result of GetBackgroundColor may have changed. - void BackgroundColorChanged(); - - // Returns the WebContents that constrains this Constrained Window. - content::WebContents* owner() const { return web_contents_; } - // Returns the toplevel widget that displays this "window". GtkWidget* widget() { return border_; } + private: // Returns the View that we collaborate with to position ourselves. TabContentsViewType* ContainingView(); - private: // Signal callbacks. CHROMEGTK_CALLBACK_1(ConstrainedWindowGtk, gboolean, OnKeyPress, GdkEventKey*); @@ -91,8 +81,6 @@ class ConstrainedWindowGtk { // Stores if |ShowWebContentsModalDialog()| has been called. bool visible_; - base::WeakPtrFactory weak_factory_; - DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowGtk); }; -- cgit v1.1