diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 18:00:57 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 18:00:57 +0000 |
| commit | 854dddc6b0f52545ab1008237630aa5472089080 (patch) | |
| tree | 125bbb133628fdf6dde3a7ca5fac539b4d02a6b1 /chrome/browser/gtk/extension_view_gtk.cc | |
| parent | 9912cd8c8bb8e89df4b33ba91c6c533e50132dca (diff) | |
| download | chromium_src-854dddc6b0f52545ab1008237630aa5472089080.zip chromium_src-854dddc6b0f52545ab1008237630aa5472089080.tar.gz chromium_src-854dddc6b0f52545ab1008237630aa5472089080.tar.bz2 | |
GTK: add browser actions popups.
Also add a new notification that tells the popup to close.
BUG=23897
TEST=--load-extension=chrome/test/data/extensions/samples/buildbot
TEST=--load-extension=chrome/test/data/extensions/samples/set_page_color
Review URL: http://codereview.chromium.org/314008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/extension_view_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/extension_view_gtk.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/gtk/extension_view_gtk.cc b/chrome/browser/gtk/extension_view_gtk.cc index d7a4fca..fbb8bf0 100644 --- a/chrome/browser/gtk/extension_view_gtk.cc +++ b/chrome/browser/gtk/extension_view_gtk.cc @@ -10,7 +10,7 @@ ExtensionViewGtk::ExtensionViewGtk(ExtensionHost* extension_host, Browser* browser) - : is_toolstrip_(true), + : is_toolstrip_(false), browser_(browser), extension_host_(extension_host), render_widget_host_view_(NULL) { @@ -37,7 +37,10 @@ void ExtensionViewGtk::SetBackground(const SkBitmap& background) { } void ExtensionViewGtk::UpdatePreferredSize(const gfx::Size& new_size) { - gtk_widget_set_size_request(native_view(), new_size.width(), -1); + // If we are showing in a shelf, then the shelf sets our height. + int height = is_toolstrip() ? -1 : new_size.height(); + + gtk_widget_set_size_request(native_view(), new_size.width(), height); } void ExtensionViewGtk::CreateWidgetHostView() { |