GTK: Fix profile selection bubble to match the chrome-theme when selected.

chrome/browser/ui/gtk/avatar_menu_item_gtk.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/avatar_menu_item_gtk.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // A checkmark is drawn in the lower-right corner of the active avatar image.
 // This value is the x offset, in pixels, from that position.
 const int kCheckMarkXOffset = 2;
 
 // The maximum width of a user name in pixels. Anything longer than this will be
 // elided.
 const int kUserNameMaxWidth = 200;
 
+// The color of the item highlight when we're in chrome-theme mode.
+const GdkColor kHighlightColor = GDK_COLOR_RGB(0xe3, 0xed, 0xf6);
+
+// The color of the background when we're in chrome-theme mode.
+const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xff, 0xff, 0xff);
+
 }  // namespace
 
 AvatarMenuItemGtk::AvatarMenuItemGtk(Delegate* delegate,
                                      const AvatarMenuModel::Item& item,
                                      size_t item_index,
                                      GtkThemeService* theme_service)
     : delegate_(delegate),
       item_(item),
       item_index_(item_index),
+      theme_service_(theme_service),
       status_label_(NULL),
       link_alignment_(NULL),
+      edit_profile_link_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
-  Init(theme_service);
+  Init(theme_service_);
+
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
+                 content::Source<ThemeService>(theme_service_));
+  theme_service_->InitThemesFor(this);
 }
 
 AvatarMenuItemGtk::~AvatarMenuItemGtk() {
   widget_.Destroy();
 }
 
 void AvatarMenuItemGtk::OpenProfile() {
   delegate_->OpenProfile(item_index_);
 }
 
 gboolean AvatarMenuItemGtk::OnProfileClick(GtkWidget* widget,
                                            GdkEventButton* event) {
   // delegate_->EditProfile() will close the avatar bubble which in turn
   // try to destroy this AvatarMenuItemGtk.
   // This is not OK to do this from the signal handler, so we'll
   // defer it.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AvatarMenuItemGtk::OpenProfile,
                  weak_factory_.GetWeakPtr()));
   return FALSE;
 }
 
 gboolean AvatarMenuItemGtk::OnProfileEnter(GtkWidget* widget,
                                            GdkEventCrossing* event) {
   if (event->detail == GDK_NOTIFY_INFERIOR)
     return FALSE;
 
-  GtkStyle* style = gtk_rc_get_style(widget);
-  GdkColor highlight_color = style->bg[GTK_STATE_SELECTED];
-  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &highlight_color);
+  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &highlighted_color_);
   if (item_.active) {
     gtk_widget_hide(status_label_);
     gtk_widget_show(link_alignment_);
   }
 
   return FALSE;
 }
 
 gboolean AvatarMenuItemGtk::OnProfileLeave(GtkWidget* widget,
                                            GdkEventCrossing* event) {
   if (event->detail == GDK_NOTIFY_INFERIOR)
     return FALSE;
 
-  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, NULL);
+  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, unhighlighted_color_);
   if (item_.active) {
     gtk_widget_show(status_label_);
     gtk_widget_hide(link_alignment_);
   }
 
   return FALSE;
 }
 
 void AvatarMenuItemGtk::EditProfile() {
   delegate_->EditProfile(item_index_);
 }
 
+void AvatarMenuItemGtk::Observe(int type,
+                                const content::NotificationSource& source,
+                                const content::NotificationDetails& details) {
+  DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
+  bool using_native = theme_service_->UsingNativeTheme();
+
+  if (using_native) {
+    GtkStyle* style = gtk_rc_get_style(widget_.get());
+    highlighted_color_ = style->bg[GTK_STATE_SELECTED];
+    unhighlighted_color_ = NULL;
+  } else {
+    highlighted_color_ = kHighlightColor;
+    unhighlighted_color_ = &kBackgroundColor;
+  }
+
+  // Assume that the widget isn't highlighted since theme changes will almost
+  // never happen while we're up.
+  gtk_widget_modify_bg(widget_.get(), GTK_STATE_NORMAL, unhighlighted_color_);
+
+  if (edit_profile_link_) {
+    gtk_chrome_link_button_set_use_gtk_theme(
+        GTK_CHROME_LINK_BUTTON(edit_profile_link_),
+        using_native);
+  }
+}
+
 void AvatarMenuItemGtk::OnEditProfileLinkClicked(GtkWidget* link) {
   // delegate_->EditProfile() will close the avatar bubble which in turn
   // try to destroy this AvatarMenuItemGtk.
   // This is not OK to do this from the signal handler, so we'll
   // defer it.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AvatarMenuItemGtk::EditProfile,
                  weak_factory_.GetWeakPtr()));
 }
@@ skipping 60 matching lines @@
       "<span size='small'>%s</span>", UTF16ToUTF8(item_.sync_state).c_str());
   gtk_label_set_markup(GTK_LABEL(status_label_), markup);
   g_free(markup);
   gtk_misc_set_alignment(GTK_MISC(status_label_), 0, 0);
   gtk_widget_set_no_show_all(status_label_, TRUE);
   gtk_box_pack_start(GTK_BOX(item_vbox), status_label_, FALSE, FALSE, 0);
   gtk_widget_show(status_label_);
 
   if (item_.active) {
     // The "edit your profile" link.
-    GtkWidget* edit_profile_link = gtk_chrome_link_button_new(
+    edit_profile_link_ = gtk_chrome_link_button_new(
         l10n_util::GetStringUTF8(IDS_PROFILES_EDIT_PROFILE_LINK).c_str());
 
     link_alignment_ = gtk_alignment_new(0, 0, 0, 0);
-    gtk_container_add(GTK_CONTAINER(link_alignment_), edit_profile_link);
+    gtk_container_add(GTK_CONTAINER(link_alignment_), edit_profile_link_);
 
     // The chrome link button contains a label that won't be shown if the button
     // is set to "no show all", so show all first.
     gtk_widget_show_all(link_alignment_);
     gtk_widget_set_no_show_all(link_alignment_, TRUE);
     gtk_widget_hide(link_alignment_);
 
     gtk_box_pack_start(GTK_BOX(item_vbox), link_alignment_, FALSE, FALSE, 0);
 
-    g_signal_connect(edit_profile_link, "clicked",
+    g_signal_connect(edit_profile_link_, "clicked",
                      G_CALLBACK(OnEditProfileLinkClickedThunk), this);
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }