retry 160232

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 245 matching lines @@
   GList* vbox_list =
       gtk_container_get_children(GTK_CONTAINER(extensions_vbox_));
   GtkWidget* hbox = static_cast<GtkWidget*>(g_list_nth_data(vbox_list, index));
 
   RemoveThrobber();
   gtk_widget_show_all(hbox);
   g_list_free(vbox_list);
   SetWidgetsEnabled(true);
 }
 
+void WebIntentPickerGtk::OnInlineDispositionAutoResize(const gfx::Size& size) {
+  gtk_widget_set_size_request(tab_contents_container_->widget(),
+                              size.width(), size.height());
+}
+
 void WebIntentPickerGtk::OnModelChanged(WebIntentPickerModel* model) {
   if (waiting_dialog_.get() && !model->IsWaitingForSuggestions()) {
     waiting_dialog_.reset();
     InitMainContents();
   }
   UpdateInstalledServices();
   UpdateCWSLabel();
   UpdateSuggestedExtensions();
   SetActionString(header_label_text_);
 }
@@ skipping 23 matching lines @@
 
   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_AUTO_TOPLEVEL,
       std::string());
 
   // Replace the picker contents with the inline disposition.
   ClearContents();
+  gtk_widget_set_size_request(contents_, -1, -1);
+  window_->BackgroundColorChanged();
 
-  GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   GtkThemeService* theme_service = GetThemeService(tab_contents_);
 
   GtkWidget* service_hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
   // TODO(gbillock): Eventually get the service icon button here.
 
   // Intent action label.
-  GtkWidget* action_label = theme_service->BuildLabel(
-      UTF16ToUTF8(title), ui::kGdkBlack);
+  GtkWidget* action_label = gtk_label_new(UTF16ToUTF8(title).c_str());
   gtk_util::ForceFontSizePixels(action_label, kMainContentPixelSize);
+  // Hardcode color; don't allow theming.
+  gtk_util::SetLabelColor(action_label, &ui::kGdkBlack);
 
   GtkWidget* label_alignment = gtk_alignment_new(0, 0.5f, 0, 0);
   gtk_container_add(GTK_CONTAINER(label_alignment), action_label);
   GtkWidget* indent_label = gtk_util::IndentWidget(label_alignment);
 
   gtk_box_pack_start(GTK_BOX(service_hbox), indent_label, FALSE, TRUE, 0);
 
   // Add link for "choose another service" if other suggestions are available
   // or if more than one (the current) service is installed.
   if (model_->GetInstalledServiceCount() > 1 ||
        model_->GetSuggestedExtensionCount()) {
     GtkWidget* use_alternate_link = theme_service->BuildChromeLinkButton(
         l10n_util::GetStringUTF8(
             IDS_INTENT_PICKER_USE_ALTERNATE_SERVICE).c_str());
     gtk_chrome_link_button_set_use_gtk_theme(
         GTK_CHROME_LINK_BUTTON(use_alternate_link),
         theme_service->UsingNativeTheme());
     gtk_util::ForceFontSizePixels(
         GTK_CHROME_LINK_BUTTON(use_alternate_link)->label,
         kMainContentPixelSize);
     g_signal_connect(use_alternate_link, "clicked",
                      G_CALLBACK(OnChooseAnotherServiceClickThunk), this);
     GtkWidget* link_alignment = gtk_alignment_new(0, 0.5f, 0, 0);
     gtk_container_add(GTK_CONTAINER(link_alignment), use_alternate_link);
     gtk_box_pack_start(GTK_BOX(service_hbox), link_alignment, TRUE, TRUE, 0);
   }
   AddCloseButton(service_hbox);
 
   // The header box
-  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_container_add(GTK_CONTAINER(vbox), service_hbox);
 
   // 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(vbox), alignment);
   gtk_container_add(GTK_CONTAINER(contents_), vbox);
 
   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());
-}
-
 void WebIntentPickerGtk::OnPendingAsyncCompleted() {
   // Requests to both the WebIntentService and the Chrome Web Store have
   // completed. If there are any services, installed or suggested, there's
   // nothing to do.
   if (model_->GetInstalledServiceCount() ||
       model_->GetSuggestedExtensionCount())
     return;
 
   // If there are no installed or suggested services at this point,
   // inform the user about it.
@@ skipping 36 matching lines @@
 GtkWidget* WebIntentPickerGtk::GetFocusWidget() {
   return contents_;
 }
 
 void WebIntentPickerGtk::DeleteDelegate() {
   // The delegate is deleted when the contents widget is destroyed. See
   // OnDestroy.
   delegate_->OnClosing();
 }
 
+bool WebIntentPickerGtk::GetBackgroundColor(GdkColor* color) {
+  if (tab_contents_container_.get()) {
+    *color = ui::kGdkWhite;
+    return true;
+  }
+
+  return false;
+}
+
 bool WebIntentPickerGtk::ShouldHaveBorderPadding() const {
   return false;
 }
 
 void WebIntentPickerGtk::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
   if (header_label_) {
     GtkThemeService* theme_service = GetThemeService(tab_contents_);
@@ skipping 186 matching lines @@
   extensions_vbox_ = NULL;
 }
 
 void WebIntentPickerGtk::ResetContents() {
   ClearContents();
 
   // Reset potential inline disposition data.
   inline_disposition_delegate_.reset(NULL);
   tab_contents_container_.reset(NULL);
   inline_disposition_tab_contents_.reset(NULL);
+  window_->BackgroundColorChanged();
 
   // Re-initialize picker widgets and data.
   InitMainContents();
   UpdateInstalledServices();
   UpdateCWSLabel();
   UpdateSuggestedExtensions();
   SetActionString(header_label_text_);
 
   gtk_widget_show_all(contents_);
 }
@@ skipping 169 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();
 }