GTK: First draft of using native themes, partially based on evan's CL 118358.

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/back_forward_button_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_dnd_util.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
@@ skipping 83 matching lines @@
   back_.reset(new BackForwardButtonGtk(browser_, false));
   gtk_box_pack_start(GTK_BOX(back_forward_hbox_), back_->widget(), FALSE,
                      FALSE, 0);
 
   forward_.reset(new BackForwardButtonGtk(browser_, true));
   gtk_box_pack_start(GTK_BOX(back_forward_hbox_), forward_->widget(), FALSE,
                      FALSE, 0);
   gtk_box_pack_start(GTK_BOX(toolbar_), back_forward_hbox_, FALSE, FALSE, 0);
 
   reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
-      l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD)));
+      l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD),
+      GTK_STOCK_REFRESH));
 
   home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
-                                 l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME)));
+                                 l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME),
+                                 GTK_STOCK_HOME));
   gtk_util::SetButtonTriggersNavigation(home_->widget());
   SetUpDragForHomeButton();
 
   // Group the start, omnibox, and go button into an hbox.
   GtkWidget* omnibox_hbox_ = gtk_hbox_new(FALSE, 0);
   star_.reset(BuildStarButton(l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR)));
   gtk_box_pack_start(GTK_BOX(omnibox_hbox_), star_->widget(), FALSE, FALSE, 0);
 
   location_bar_->Init();
   gtk_box_pack_start(GTK_BOX(omnibox_hbox_), location_bar_->widget(), TRUE,
@@ skipping 14 matching lines @@
 
   GtkWidget* chrome_menu = BuildToolbarMenuButton(IDR_MENU_CHROME,
       l10n_util::GetStringFUTF8(IDS_APPMENU_TOOLTIP,
           WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME))),
       &app_menu_button_);
   app_menu_.reset(new MenuGtk(this, GetStandardAppMenu(), accel_group_));
   gtk_box_pack_start(GTK_BOX(menus_hbox_), chrome_menu, FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), menus_hbox_, FALSE, FALSE, 0);
 
+  // Force all the CustomDrawButtons to load the correct rendering style.
+  UserChangedTheme();
+
   gtk_widget_show_all(toolbar_);
 
   if (show_home_button_.GetValue()) {
     gtk_widget_show(home_->widget());
   } else {
     gtk_widget_hide(home_->widget());
   }
 }
 
 void BrowserToolbarGtk::AddToolbarToBox(GtkWidget* box) {
@@ skipping 92 matching lines @@
 
   profile_ = profile;
   location_bar_->SetProfile(profile);
 }
 
 void BrowserToolbarGtk::UpdateTabContents(TabContents* contents,
                                           bool should_restore_state) {
   location_bar_->Update(should_restore_state ? contents : NULL);
 }
 
+void BrowserToolbarGtk::UserChangedTheme() {
+  bool use_gtk = GtkThemeProvider::UseSystemThemeGraphics(profile_);
+  back_->SetUseSystemTheme(use_gtk);
+  forward_->SetUseSystemTheme(use_gtk);
+  reload_->SetUseSystemTheme(use_gtk);
+  home_->SetUseSystemTheme(use_gtk);
+
+  gtk_chrome_button_set_use_gtk_rendering(
+      GTK_CHROME_BUTTON(page_menu_button_.get()), use_gtk);
+  gtk_chrome_button_set_use_gtk_rendering(
+      GTK_CHROME_BUTTON(app_menu_button_.get()), use_gtk);
+}
+
 gfx::Rect BrowserToolbarGtk::GetPopupBounds() const {
   GtkWidget* star = star_->widget();
   GtkWidget* go = go_->widget();
 
   // TODO(deanm): The go and star buttons probably share the same window,
   // so this could be optimized to only one origin request.
   gint go_x, go_y;
   gdk_window_get_origin(go->window, &go_x, &go_y);
   go_x += go->allocation.x + go->allocation.width;  // Right edge.
 
   gint star_x, star_y;
   gdk_window_get_origin(star->window, &star_x, &star_y);
   star_x += star->allocation.x;  // Left edge.
   star_y += star->allocation.y + star->allocation.height;  // Bottom edge.
 
   return gfx::Rect(star_x + kPopupLeftRightMargin, star_y + kPopupTopMargin,
                    go_x - star_x - (2 * kPopupLeftRightMargin), 0);
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
-    const std::string& localized_tooltip) {
+    const std::string& localized_tooltip, const char* stock_id) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
-      highlight_id, depressed_id);
+      highlight_id, depressed_id, stock_id);
 
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   g_signal_connect(button->widget(), "button-release-event",
                    G_CALLBACK(OnButtonRelease), this);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button->widget(), FALSE, FALSE, 0);
   return button;
@@ skipping 12 matching lines @@
 }
 
 GtkWidget* BrowserToolbarGtk::BuildToolbarMenuButton(
     int icon_id,
     const std::string& localized_tooltip,
     OwnedWidgetGtk* owner) {
   GtkWidget* button = gtk_chrome_button_new();
   owner->Own(button);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  gtk_container_set_border_width(GTK_CONTAINER(button), 2);
+  if (!GtkThemeProvider::UseSystemThemeGraphics(profile_))
+    gtk_container_set_border_width(GTK_CONTAINER(button), 2);
   gtk_container_add(GTK_CONTAINER(button),
                     gtk_image_new_from_pixbuf(rb.GetPixbufNamed(icon_id)));
 
   gtk_widget_set_tooltip_text(button, localized_tooltip.c_str());
   g_signal_connect(button, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEvent), this);
   GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
 
   return button;
 }
@@ skipping 94 matching lines @@
                                              UTF8ToWide(url.spec()));
   }
 }
 
 void BrowserToolbarGtk::InitNineBox() {
   // TODO(estade): use |profile_|?
   background_ninebox_.reset(new NineBox(
       browser_->profile()->GetThemeProvider(),
       0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0));
 }