Properly fix menu display when using dark system themes.

The drawing code in the tab strip was modifying the GC, which affected
the GC used for drawing menus.

Review URL: http://codereview.chromium.org/55022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12713 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 14 deletions

diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 26e8936..6ef4c20 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -402,10 +402,6 @@ int ChromeMain(int argc, const char** argv) {
 #endif
   } else if (process_type.empty()) {
 #if defined(OS_LINUX)
-    // Disable user theming.
-    gchar* default_gtkrc_files[] = { NULL };
-    gtk_rc_set_default_files(default_gtkrc_files);
-
     // gtk_init() can change |argc| and |argv|, but nobody else uses them.
     gtk_init(&argc, const_cast<char***>(&argv));
     // Register GTK assertions to go through our logging system.
@@ -417,12 +413,6 @@ int ChromeMain(int argc, const char** argv) {
                                                   G_LOG_LEVEL_WARNING),
                       GtkFatalLogHandler,
                       NULL);
-
-    // This theme is chosen rather abritrarily. We set many colors ourselves,
-    // so we need to set a light theme or some of the colors will clash.
-    g_object_set(gtk_settings_get_default(),
-                 "gtk-theme-name", "Mist",
-                 NULL);
 #endif
 
     ScopedOleInitializer ole_initializer;
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 7a55648..47a89f9 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -129,7 +129,7 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
     }
 
     if (accel_group && menu_data->accel_key) {
-      // If we ever want to let the user do any key re-mapping, we'll need to
+      // If we ever want to let the user do any key remaping, we'll need to
       // change the following so we make a gtk_accel_map which keeps the actual
       // keys.
       gtk_widget_add_accelerator(menu_item,
@@ -150,7 +150,6 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
     gtk_menu_append(menu, menu_item);
     last_menu_item = menu_item;
   }
-  gtk_widget_modify_bg(menu, GTK_STATE_NORMAL, &gfx::kGdkWhite);
 }
 
 void MenuGtk::BuildMenuFromDelegate() {
@@ -181,7 +180,6 @@ void MenuGtk::BuildMenuFromDelegate() {
     gtk_widget_show(menu_item);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu_.get()), menu_item);
   }
-  gtk_widget_modify_bg(menu_.get(), GTK_STATE_NORMAL, &gfx::kGdkWhite);
 }
 
 // static
diff --git a/chrome/browser/gtk/tab_strip_gtk.cc b/chrome/browser/gtk/tab_strip_gtk.cc
index 94b2cc8..20b5308 100644
--- a/chrome/browser/gtk/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tab_strip_gtk.cc
@@ -239,7 +239,7 @@ void TabStripGtk::TileImageInt(GdkPixbuf* pixbuf,
 }
 
 void TabStripGtk::PaintTab(int index, bool selected) {
-  GdkGC* gc = tabstrip_.get()->style->fg_gc[GTK_WIDGET_STATE(tabstrip_.get())];
+  GdkGC* gc = gdk_gc_new(tabstrip_.get()->window);
   TabImage& image = (selected) ? tab_active_ : tab_inactive_;
   TabData& data = tab_data_.at(index);
   gfx::Rect bounds = data.bounds;
@@ -282,6 +282,8 @@ void TabStripGtk::PaintTab(int index, bool selected) {
 
   DrawImageInt(close_button_.normal,
                data.close_button_bounds.x(), data.close_button_bounds.y());
+
+  g_object_unref(gc);
 }
 
 ////////////////////////////////////////////////////////////////////////////////