summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk/constrained_window_gtk.h
diff options
context:
space:
mode:
authorwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 15:55:54 +0000
committerwittman@chromium.org <wittman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 15:55:54 +0000
commitfe6db3f9cfa549099fef012195aaae3944b0199a (patch)
tree635f1411d3913789029feb980fe5ca708f371026 /chrome/browser/ui/gtk/constrained_window_gtk.h
parent41fb870ccdb44d514fcde30ad5359746e3f12297 (diff)
downloadchromium_src-fe6db3f9cfa549099fef012195aaae3944b0199a.zip
chromium_src-fe6db3f9cfa549099fef012195aaae3944b0199a.tar.gz
chromium_src-fe6db3f9cfa549099fef012195aaae3944b0199a.tar.bz2
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
Diffstat (limited to 'chrome/browser/ui/gtk/constrained_window_gtk.h')
-rw-r--r--chrome/browser/ui/gtk/constrained_window_gtk.h14
1 files changed, 1 insertions, 13 deletions
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<ConstrainedWindowGtk> weak_factory_;
-
DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowGtk);
};