GTK: Use IDR_THEME_WINDOW_CONTROL_BACKGROUND when drawing min/max/close and new tab buttons.

chrome/browser/ui/gtk/browser_titlebar.cc

 // Copyright (c) 2011 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/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 383 matching lines @@
                        G_CALLBACK(OnPanelSettingsMenuButtonPressedThunk), this);
       gtk_widget_set_no_show_all(panel_wrench_button_->widget(), TRUE);
     }
 
     app_mode_title_ = gtk_label_new(NULL);
     gtk_label_set_ellipsize(GTK_LABEL(app_mode_title_), PANGO_ELLIPSIZE_END);
     gtk_misc_set_alignment(GTK_MISC(app_mode_title_), 0.0, 0.5);
     gtk_box_pack_start(GTK_BOX(app_mode_hbox), app_mode_title_, TRUE, TRUE,
                        0);
 
-    // Register with the theme provider to set the |app_mode_title_| label
-    // color.
-    theme_service_ = GtkThemeService::GetFrom(
-        browser_window_->browser()->profile());
-    registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
-                   content::Source<ThemeService>(theme_service_));
-    theme_service_->InitThemesFor(this);
     UpdateTitleAndIcon();
   }
 
+  theme_service_ = GtkThemeService::GetFrom(
+      browser_window_->browser()->profile());
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
+                 content::Source<ThemeService>(theme_service_));
+  theme_service_->InitThemesFor(this);
+
   gtk_widget_show_all(container_);
 
   ui::ActiveWindowWatcherX::AddObserver(this);
 }
 
 BrowserTitlebar::~BrowserTitlebar() {
   ui::ActiveWindowWatcherX::RemoveObserver(this);
 #if defined(USE_GCONF)
   GConfTitlebarListener::GetInstance()->RemoveObserver(this);
 #endif
@@ skipping 119 matching lines @@
   std::string localized_tooltip = l10n_util::GetStringUTF8(tooltip);
   gtk_widget_set_tooltip_text(button->widget(),
                               localized_tooltip.c_str());
   if (start)
     gtk_box_pack_start(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
   else
     gtk_box_pack_end(GTK_BOX(box), button->widget(), FALSE, FALSE, 0);
   return button;
 }
 
+void BrowserTitlebar::UpdateButtonBackground(CustomDrawButton* button) {
+  SkColor color = theme_service_->GetColor(
+      ThemeService::COLOR_BUTTON_BACKGROUND);
+  SkBitmap* background =
+      theme_service_->GetBitmapNamed(IDR_THEME_WINDOW_CONTROL_BACKGROUND);
+
+  // TODO(erg): For now, we just use a completely black mask and we can get
+  // aways with this in the short term because our buttons are rectangles. We

[Evan Stade, 2011/11/11 00:09:15]

away

+  // should get Glen to make properly hinted masks that match our
+  // masks. http://crbug.com/103661

[Evan Stade, 2011/11/11 00:09:15]

"masks that match our masks" -- could you reword this to be more clear

+  SkBitmap mask;
+  mask.setConfig(SkBitmap::kARGB_8888_Config,
+                 button->SurfaceWidth(), button->SurfaceHeight(), 0);
+  mask.allocPixels();
+  mask.eraseColor(SK_ColorBLACK);
+
+  button->SetBackground(color, background, &mask);
+}
+
 void BrowserTitlebar::UpdateCustomFrame(bool use_custom_frame) {
   using_custom_frame_ = use_custom_frame;
   if (!use_custom_frame ||
       (browser_window_->IsMaximized() && unity::IsRunning())) {
     if (titlebar_left_buttons_vbox_)
       gtk_widget_hide(titlebar_left_buttons_vbox_);
     if (titlebar_right_buttons_vbox_)
       gtk_widget_hide(titlebar_right_buttons_vbox_);
   } else {
     if (titlebar_left_buttons_vbox_)
@@ skipping 424 matching lines @@
           command_id);
   if (accelerator_gtk)
     *accelerator = *accelerator_gtk;
   return accelerator_gtk;
 }
 
 void BrowserTitlebar::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_BROWSER_THEME_CHANGED:
+    case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       UpdateTextColor();
+
+      if (minimize_button_.get())
+        UpdateButtonBackground(minimize_button_.get());
+      if (maximize_button_.get())
+        UpdateButtonBackground(maximize_button_.get());
+      if (restore_button_.get())
+        UpdateButtonBackground(restore_button_.get());
+      if (close_button_.get())
+        UpdateButtonBackground(close_button_.get());
       break;
+    }
 
     case chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED:
       UpdateAvatar();
       break;
 
     default:
       NOTREACHED();
   }
 }
 
@@ skipping 86 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }