GTK Themes: Make the omnibox area look more native.

chrome/browser/gtk/go_button_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/go_button_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
-#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
+#include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 GoButtonGtk::GoButtonGtk(LocationBarViewGtk* location_bar, Browser* browser)
     : location_bar_(location_bar),
       browser_(browser),
       button_delay_(0),
       stop_timer_(this),
       intended_mode_(MODE_GO),
       visible_mode_(MODE_GO),
       state_(BS_NORMAL),
-      go_(browser ? GtkThemeProvider::GetFrom(browser->profile()) : NULL,
-          IDR_GO, IDR_GO_P, IDR_GO_H, 0),
-      stop_(browser ? GtkThemeProvider::GetFrom(browser->profile()) : NULL,
-            IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0),
+      theme_provider_(browser ?
+                      GtkThemeProvider::GetFrom(browser->profile()) : NULL),
+      go_(theme_provider_, IDR_GO, IDR_GO_P, IDR_GO_H, 0),
+      stop_(theme_provider_, IDR_STOP, IDR_STOP_P, IDR_STOP_H, 0),
       widget_(gtk_button_new()) {
   gtk_widget_set_size_request(widget_.get(),
                               gdk_pixbuf_get_width(go_.pixbufs(0)),
                               gdk_pixbuf_get_height(go_.pixbufs(0)));
 
   gtk_widget_set_app_paintable(widget_.get(), TRUE);
   // We effectively double-buffer by virtue of having only one image...
   gtk_widget_set_double_buffered(widget_.get(), FALSE);
 
   g_signal_connect(G_OBJECT(widget_.get()), "expose-event",
                    G_CALLBACK(OnExpose), this);
   g_signal_connect(G_OBJECT(widget_.get()), "enter",
                    G_CALLBACK(OnEnter), this);
   g_signal_connect(G_OBJECT(widget_.get()), "leave",
                    G_CALLBACK(OnLeave), this);
   g_signal_connect(G_OBJECT(widget_.get()), "clicked",
                    G_CALLBACK(OnClicked), this);
   GTK_WIDGET_UNSET_FLAGS(widget_.get(), GTK_CAN_FOCUS);
 
   SetTooltip();
+
+  if (theme_provider_) {
+    theme_provider_->InitThemesFor(this);
+    registrar_.Add(this,
+                   NotificationType::BROWSER_THEME_CHANGED,
+                   NotificationService::AllSources());
+  }
 }
 
 GoButtonGtk::~GoButtonGtk() {
   widget_.Destroy();
 }
 
 void GoButtonGtk::ChangeMode(Mode mode, bool force) {
   intended_mode_ = mode;
 
   // If the change is forced, or the user isn't hovering the icon, or it's safe
   // to change it to the other image type, make the change immediately;
   // otherwise we'll let it happen later.
   if (force || (state() != BS_HOT) || ((mode == MODE_STOP) ?
       stop_timer_.empty() : (visible_mode_ != MODE_STOP))) {
     stop_timer_.RevokeAll();
     gtk_widget_queue_draw(widget_.get());
     SetTooltip();
     visible_mode_ = mode;
+
+    UpdateThemeButtons();
   }
 }
 
+void GoButtonGtk::Observe(NotificationType type,
+    const NotificationSource& source, const NotificationDetails& details) {
+  DCHECK(NotificationType::BROWSER_THEME_CHANGED == type);
+
+  GtkThemeProvider* provider = static_cast<GtkThemeProvider*>(
+      Source<GtkThemeProvider>(source).ptr());
+  DCHECK(provider == theme_provider_);
+  UpdateThemeButtons();
+}
+
 Task* GoButtonGtk::CreateButtonTimerTask() {
   return stop_timer_.NewRunnableMethod(&GoButtonGtk::OnButtonTimer);
 }
 
 void GoButtonGtk::OnButtonTimer() {
   stop_timer_.RevokeAll();
   ChangeMode(intended_mode_, true);
 }
 
 // static
 gboolean GoButtonGtk::OnExpose(GtkWidget* widget,
                                GdkEventExpose* e,
                                GoButtonGtk* button) {
-  if (button->visible_mode_ == MODE_GO) {
-    return button->go_.OnExpose(widget, e);
+  if (button->theme_provider_->UseGtkTheme()) {
+    return FALSE;
   } else {
-    return button->stop_.OnExpose(widget, e);
+    if (button->visible_mode_ == MODE_GO) {
+      return button->go_.OnExpose(widget, e);
+    } else {
+      return button->stop_.OnExpose(widget, e);
+    }
   }
 }
 
 // static
 gboolean GoButtonGtk::OnEnter(GtkButton* widget, GoButtonGtk* button) {
   DCHECK_EQ(BS_NORMAL, button->state());
   button->state_ = BS_HOT;
   return TRUE;
 }
 
@@ skipping 68 matching lines @@
         widget_.get(),
         true ? l10n_util::GetStringFUTF8(
             IDS_TOOLTIP_GO_SITE, WideToUTF16(current_text)).c_str() :
         l10n_util::GetStringFUTF8(IDS_TOOLTIP_GO_SEARCH, UTF8ToUTF16("Google"),
                                   WideToUTF16(current_text)).c_str());
   } else {
     gtk_widget_set_tooltip_text(
         widget_.get(), l10n_util::GetStringUTF8(IDS_TOOLTIP_STOP).c_str());
   }
 }
+
+void GoButtonGtk::UpdateThemeButtons() {
+  if (theme_provider_->UseGtkTheme()) {
+    // TODO(erg): Waiting for Glen to make a version of these that don't have a
+    // button border on it.
+    if (intended_mode_ == MODE_GO) {
+      gtk_button_set_image(
+          GTK_BUTTON(widget_.get()),
+          gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_BUTTON));
+    } else {
+      gtk_button_set_image(
+          GTK_BUTTON(widget_.get()),
+          gtk_image_new_from_stock(GTK_STOCK_STOP, GTK_ICON_SIZE_BUTTON));
+    }
+
+    gtk_widget_set_size_request(widget_.get(), -1, -1);
+    gtk_widget_set_app_paintable(widget_.get(), FALSE);
+    gtk_widget_set_double_buffered(widget_.get(), TRUE);
+  } else {
+    gtk_widget_set_size_request(widget_.get(),
+                                gdk_pixbuf_get_width(go_.pixbufs(0)),
+                                gdk_pixbuf_get_height(go_.pixbufs(0)));
+
+    gtk_widget_set_app_paintable(widget_.get(), TRUE);
+    // We effectively double-buffer by virtue of having only one image...
+    gtk_widget_set_double_buffered(widget_.get(), FALSE);
+  }
+}