3 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/gtk/extension_shelf_gtk.cc b/chrome/browser/gtk/extension_shelf_gtk.cc
index 1262c16..768aee8 100644
--- a/chrome/browser/gtk/extension_shelf_gtk.cc
+++ b/chrome/browser/gtk/extension_shelf_gtk.cc
@@ -47,7 +47,7 @@ class ExtensionShelfGtk::Toolstrip {
 };
 
 void ExtensionShelfGtk::Toolstrip::AddToolstripToBox(GtkWidget* box) {
-  gtk_box_pack_start(GTK_BOX(box), native_view(), TRUE, TRUE,
+  gtk_box_pack_start(GTK_BOX(box), native_view(), FALSE, FALSE,
                      kToolstripPadding);
 }
 
diff --git a/chrome/browser/gtk/extension_view_gtk.cc b/chrome/browser/gtk/extension_view_gtk.cc
index 5940d0f..60d1a3f 100644
--- a/chrome/browser/gtk/extension_view_gtk.cc
+++ b/chrome/browser/gtk/extension_view_gtk.cc
@@ -23,6 +23,10 @@ RenderViewHost* ExtensionViewGtk::render_view_host() const {
   return extension_host_->render_view_host();
 }
 
+void ExtensionViewGtk::UpdatePreferredWidth(int pref_width) {
+  gtk_widget_set_size_request(native_view(), pref_width, -1);
+}
+
 void ExtensionViewGtk::CreateWidgetHostView() {
   DCHECK(!render_widget_host_view_);
   render_widget_host_view_ = new RenderWidgetHostViewGtk(render_view_host());
diff --git a/chrome/browser/gtk/extension_view_gtk.h b/chrome/browser/gtk/extension_view_gtk.h
index b569c03..1220873 100644
--- a/chrome/browser/gtk/extension_view_gtk.h
+++ b/chrome/browser/gtk/extension_view_gtk.h
@@ -21,6 +21,10 @@ class ExtensionViewGtk {
   bool is_toolstrip() const { return is_toolstrip_; }
   void set_is_toolstrip(bool is_toolstrip) { is_toolstrip_ = is_toolstrip; }
 
+  // Method for the ExtensionHost to notify us about the correct width for
+  // extension contents.
+  void UpdatePreferredWidth(int pref_width);
+
  private:
   RenderViewHost* render_view_host() const;