[Gtk, WebIntents] Support autosizing of inline content.

chrome/browser/ui/gtk/web_intent_picker_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/web_intent_picker_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 224 matching lines @@
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
 
   tab_contents_container_.reset(new TabContentsContainerGtk(NULL));
   tab_contents_container_->SetTab(inline_disposition_tab_contents_.get());
 
   inline_disposition_tab_contents_->web_contents()->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_START_PAGE,
       std::string());
 
   // Replace the picker contents with the inline disposition.
-
   gtk_util::RemoveAllChildren(contents_);

[Evan Stade, 2012/05/18 21:16:07]

try removing all children from sub_contents instead to avoid re-constructing
quite as much widget hierarchy.

 
   GtkWidget* service_hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
   // TODO(gbillock): Eventually get the service icon button here.
   // Maybe add a title or something too?
   close_button_.reset(
       CustomDrawButton::CloseButton(GetThemeService(wrapper_)));
   g_signal_connect(close_button_->widget(),
                    "clicked",
                    G_CALLBACK(OnCloseButtonClickThunk),
                    this);
   gtk_widget_set_can_focus(close_button_->widget(), FALSE);
   GtkWidget* close_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(close_vbox), close_button_->widget(),
                      FALSE, FALSE, 0);
   gtk_box_pack_end(GTK_BOX(service_hbox), close_vbox, FALSE, FALSE, 0);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
   gtk_box_pack_start(GTK_BOX(vbox), service_hbox, TRUE, TRUE, 0);
 
   // The separator between the icon/title/close and the inline renderer.
   gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, TRUE, 0);
 
-  gtk_box_pack_end(GTK_BOX(vbox), tab_contents_container_->widget(),
-                   TRUE, TRUE, 0);
-
+  // hbox for the web contents, so we can have spacing on the borders.
+  GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
+  gtk_alignment_set_padding(
+      GTK_ALIGNMENT(alignment), 0, ui::kContentAreaBorder,
+      ui::kContentAreaBorder, ui::kContentAreaBorder);
+  gtk_container_add(GTK_CONTAINER(alignment),
+                    tab_contents_container_->widget());
+  gtk_box_pack_end(GTK_BOX(vbox), alignment, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(contents_), vbox);
 
-  gfx::Size size = GetDefaultInlineDispositionSize(web_contents);
+  gfx::Size size = GetMinInlineDispositionSize();
   gtk_widget_set_size_request(tab_contents_container_->widget(),
                               size.width(), size.height());
   gtk_widget_show_all(contents_);
 }
 
+void WebIntentPickerGtk::OnInlineDispositionAutoResize(const gfx::Size& size) {
+  gtk_widget_set_size_request(tab_contents_container_->widget(),
+                              size.width(), size.height());
+}
+
 GtkWidget* WebIntentPickerGtk::GetWidgetRoot() {
   return contents_;
 }
 
 GtkWidget* WebIntentPickerGtk::GetFocusWidget() {
   return contents_;
 }
 
 void WebIntentPickerGtk::DeleteDelegate() {
   // The delegate is deleted when the contents widget is destroyed. See
@@ skipping 309 matching lines @@
   return alignment;
 }
 
 void WebIntentPickerGtk::RemoveThrobber() {
   GtkWidget* alignment = gtk_widget_get_parent(throbber_->widget());
   DCHECK(alignment);
   gtk_container_remove(GTK_CONTAINER(alignment), throbber_->widget());
   gtk_widget_destroy(alignment);
   throbber_->Stop();
 }