[gtk] fix up appearance of website settings dropdown menus

chrome/browser/ui/gtk/website_settings/permission_selector.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/website_settings/permission_selector.h"
 
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 55 matching lines @@
   // Add a label for the permission type.
   GtkWidget* label = theme_service->BuildLabel(l10n_util::GetStringFUTF8(
       IDS_WEBSITE_SETTINGS_PERMISSION_TYPE,
       WebsiteSettingsUI::PermissionTypeToUIString(type)),
       ui::kGdkBlack);
   gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_WORD_CHAR);
 
   gtk_box_pack_start(GTK_BOX(widget_), label, FALSE, FALSE, 0);
 
   // Add the menu button.
-  menu_button_ = gtk_button_new_with_label(
+  menu_button_ = theme_service->BuildChromeButton();
+  GtkWidget* button_hbox = gtk_hbox_new(FALSE, 0);
+  gtk_container_add(GTK_CONTAINER(menu_button_), button_hbox);
+
+  GtkWidget* button_label = theme_service->BuildLabel(
       UTF16ToUTF8(WebsiteSettingsUI::PermissionActionToUIString(
-          setting, default_setting, source)).c_str());
+          setting, default_setting, source)),
+      ui::kGdkBlack);
+  gtk_box_pack_start(GTK_BOX(button_hbox), button_label, FALSE, FALSE,
+                     ui::kControlSpacing);
+
   bool user_setting = source == content_settings::SETTING_SOURCE_USER;
   gtk_widget_set_sensitive(GTK_WIDGET(menu_button_), user_setting);
   if (user_setting) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    pixbuf = rb.GetNativeImageNamed(IDR_APP_DROPARROW).ToGdkPixbuf();
-    GtkWidget* arrow = gtk_image_new_from_pixbuf(pixbuf);
-    gtk_button_set_image(GTK_BUTTON(menu_button_), arrow);
-    gtk_button_set_image_position(GTK_BUTTON(menu_button_),
-                                  base::i18n::IsRTL() ? GTK_POS_LEFT
-                                                      : GTK_POS_RIGHT);
+    GtkWidget* arrow = NULL;
+    // We don't handle theme changes, which is a bug but they are very unlikely
+    // to occur while a bubble is grabbing input.
+    if (theme_service->UsingNativeTheme()) {
+      arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+    } else {
+      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      arrow = gtk_image_new_from_pixbuf(
+          rb.GetNativeImageNamed(IDR_APP_DROPARROW).ToGdkPixbuf());
+    }
+    gtk_box_pack_start(GTK_BOX(button_hbox), arrow, FALSE, FALSE, 0);

[markusheintz_, 2012/09/20 13:04:49]

Does this work for RTL mode?

[Evan Stade, 2012/09/20 14:15:38]

yes

   }
   gtk_button_set_relief(GTK_BUTTON(menu_button_), GTK_RELIEF_NONE);
   gtk_box_pack_start(GTK_BOX(widget_), menu_button_, FALSE, FALSE, 0);
 
   menu_model_.reset(new PermissionMenuModel(this, type, default_setting,
                                             setting));
   MenuGtk::Delegate* delegate = new MenuGtk::Delegate();
   menu_.reset(new MenuGtk(delegate, menu_model_.get()));
   g_signal_connect(menu_button_, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEventThunk), this);
@@ skipping 41 matching lines @@
           content_settings::SETTING_SOURCE_USER)).c_str());
 
   FOR_EACH_OBSERVER(PermissionSelectorObserver,
                     observer_list_,
                     OnPermissionChanged(this));
 }
 
 bool PermissionSelector::IsCommandIdChecked(int command_id) {
   return setting_ == CommandIdToContentSetting(command_id);
 }