Web Intents: Remove the CWS icon from GTK picker.

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 397 matching lines @@
   // Hbox containing the header label.
   GtkWidget* header_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(sub_contents), header_hbox, TRUE, TRUE, 0);
 
   // Label text will be set in the call to SetActionString().
   header_label_ = theme_service->BuildLabel(std::string(), ui::kGdkBlack);
   gtk_util::ForceFontSizePixels(header_label_, kHeaderLabelPixelSize);
   gtk_box_pack_start(GTK_BOX(header_hbox), header_label_, TRUE, TRUE, 0);
   gtk_misc_set_alignment(GTK_MISC(header_label_), 0, 0);
 
-
   // Add separation between the installed services list and the app suggestions.
   GtkWidget* button_alignment = gtk_alignment_new(0.5, 0, 0, 0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(button_alignment), 0,
                             kMainContentPixelSize * 2, 0, 0);
 
   // Vbox containing all service buttons.
   button_vbox_ = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(button_alignment), button_vbox_);
   gtk_box_pack_start(GTK_BOX(sub_contents), button_alignment, TRUE, TRUE, 0);
 
@@ skipping 13 matching lines @@
 
   // Suggested extensions vbox.
   extensions_vbox_ = gtk_vbox_new(FALSE, ui::kControlSpacing);
   GtkWidget* indent_extensions = gtk_alignment_new(0.0, 0.5, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(indent_extensions), 0, 0,
                             ui::kGroupIndent, ui::kGroupIndent);
   gtk_container_add(GTK_CONTAINER(indent_extensions), extensions_vbox_);
   gtk_widget_set_no_show_all(indent_extensions, TRUE);
   gtk_box_pack_start(GTK_BOX(sub_contents), indent_extensions, TRUE, TRUE, 0);
 
-  // Chrome Web Store icon.
-  GtkWidget* hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
-  SkBitmap* bmp = ResourceBundle::GetSharedInstance().GetBitmapNamed(
-        IDR_WEBSTORE_ICON_16);
-  GtkWidget* icon = gtk_image_new_from_pixbuf(gfx::GdkPixbufFromSkBitmap(bmp));
-  gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0);
-
   // CWS 'More Suggestions' link.
+  GtkWidget* link_alignment = gtk_alignment_new(0, 0.5f, 0, 0);
   GtkWidget* more_suggestions_link = theme_service->BuildChromeLinkButton(
       l10n_util::GetStringUTF8(IDS_INTENT_PICKER_MORE_SUGGESTIONS).c_str());
-  gtk_box_pack_start(GTK_BOX(hbox), more_suggestions_link, FALSE, FALSE, 0);
+  gtk_container_add(GTK_CONTAINER(link_alignment), more_suggestions_link);
   gtk_chrome_link_button_set_use_gtk_theme(
       GTK_CHROME_LINK_BUTTON(more_suggestions_link),
       theme_service->UsingNativeTheme());
   gtk_util::ForceFontSizePixels(
       GTK_CHROME_LINK_BUTTON(more_suggestions_link)->label,
       kMainContentPixelSize);
   g_signal_connect(more_suggestions_link, "clicked",
                    G_CALLBACK(OnMoreSuggestionsLinkClickThunk), this);
 
-  GtkWidget* indent_hbox = gtk_util::IndentWidget(hbox);
-  gtk_box_pack_start(GTK_BOX(sub_contents), indent_hbox, TRUE, TRUE, 0);
+  GtkWidget* indent_link = gtk_util::IndentWidget(link_alignment);
+  gtk_box_pack_start(GTK_BOX(sub_contents), indent_link, TRUE, TRUE, 0);
 
   // Throbber, which will be added to the hierarchy when necessary.
   throbber_.reset(new ThrobberGtk(theme_service));
 
   g_signal_connect(contents_, "destroy", G_CALLBACK(&OnDestroyThunk), this);
 }
 
 void WebIntentPickerGtk::UpdateInstalledServices() {
   gtk_util::RemoveAllChildren(button_vbox_);
 
   if (model_->GetInstalledServiceCount() == 0) {
     gtk_widget_hide(gtk_widget_get_parent(button_vbox_));
     return;
   }
 
   for (size_t i = 0; i < model_->GetInstalledServiceCount(); ++i) {
     const WebIntentPickerModel::InstalledService& installed_service =
         model_->GetInstalledServiceAt(i);
 
     GtkWidget* button = gtk_button_new();
-
     gtk_widget_set_tooltip_text(button, installed_service.url.spec().c_str());
     gtk_button_set_label(GTK_BUTTON(button),
                          UTF16ToUTF8(installed_service.title).c_str());
     gtk_button_set_alignment(GTK_BUTTON(button), 0, 0);
 
     gtk_container_add(GTK_CONTAINER(button_vbox_), button);
     g_signal_connect(button, "clicked", G_CALLBACK(OnServiceButtonClickThunk),
                      this);
 
     SetServiceButtonImage(button, installed_service.favicon.ToGdkPixbuf());
@@ skipping 101 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();
 }