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

chrome/browser/ui/gtk/avatar_menu_bubble_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_bubble_gtk.h"
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/avatar_menu_item_gtk.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.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/location_bar_view_gtk.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 // The minimum width in pixels of the bubble.
 const int kBubbleMinWidth = 175;
 
 // The number of pixels of padding on the left of the 'New Profile' link at the
 // bottom of the bubble.
 const int kNewProfileLinkLeftPadding = 40;
 
 }  // namespace
 
 AvatarMenuBubbleGtk::AvatarMenuBubbleGtk(Browser* browser,
                                          GtkWidget* anchor,
                                          BubbleGtk::ArrowLocationGtk arrow,
                                          const gfx::Rect* rect)
     : contents_(NULL),
       theme_service_(GtkThemeService::GetFrom(browser->profile())),
+      new_profile_link_(NULL),
       minimum_width_(kBubbleMinWidth) {
   avatar_menu_model_.reset(new AvatarMenuModel(
       &g_browser_process->profile_manager()->GetProfileInfoCache(),
       this, browser));
 
   InitContents();
 
   OnAvatarMenuModelChanged(avatar_menu_model_.get());
 
   bubble_ = BubbleGtk::Show(anchor,
                             rect,
                             contents_,
                             arrow,
                             true,  // |match_system_theme|
                             true,  // |grab_input|
                             theme_service_,
                             this);  // |delegate|
   g_signal_connect(contents_, "destroy",
                    G_CALLBACK(&OnDestroyThunk), this);
+
+  registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
+                 content::Source<ThemeService>(theme_service_));
+  theme_service_->InitThemesFor(this);
 }
 
 AvatarMenuBubbleGtk::~AvatarMenuBubbleGtk() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
 }
 
 void AvatarMenuBubbleGtk::OnDestroy(GtkWidget* widget) {
   // We are self deleting, we have a destroy signal setup to catch when we
   // destroyed (via the BubbleGtk being destroyed), and delete ourself.
   delete this;
@@ skipping 15 matching lines @@
 void AvatarMenuBubbleGtk::OpenProfile(size_t profile_index) {
   avatar_menu_model_->SwitchToProfile(profile_index);
   bubble_->Close();
 }
 
 void AvatarMenuBubbleGtk::EditProfile(size_t profile_index) {
   avatar_menu_model_->EditProfile(profile_index);
   bubble_->Close();
 }
 
+void AvatarMenuBubbleGtk::Observe(int type,
+                                  const content::NotificationSource& source,
+                                  const content::NotificationDetails& details) {
+  DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
+  gtk_chrome_link_button_set_use_gtk_theme(
+      GTK_CHROME_LINK_BUTTON(new_profile_link_),
+      theme_service_->UsingNativeTheme());
+}
+
 void AvatarMenuBubbleGtk::OnSizeRequest(GtkWidget* widget,
                                         GtkRequisition* req) {
   // Always use the maximum width ever requested.
   if (req->width < minimum_width_)
     req->width = minimum_width_;
   else
     minimum_width_ = req->width;
 }
 
 void AvatarMenuBubbleGtk::OnNewProfileLinkClicked(GtkWidget* link) {
@@ skipping 18 matching lines @@
 
     items_.push_back(item);
 
     gtk_box_pack_start(GTK_BOX(items_vbox), item->widget(), TRUE, TRUE, 0);
   }
 
   gtk_box_pack_start(GTK_BOX(contents_), items_vbox, TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(contents_), gtk_hseparator_new(), TRUE, TRUE, 0);
 
   // The new profile link.
-  GtkWidget* new_profile_link = gtk_chrome_link_button_new(
+  new_profile_link_ = gtk_chrome_link_button_new(
       l10n_util::GetStringUTF8(IDS_PROFILES_CREATE_NEW_PROFILE_LINK).c_str());
-  g_signal_connect(new_profile_link, "clicked",
+  g_signal_connect(new_profile_link_, "clicked",
                    G_CALLBACK(OnNewProfileLinkClickedThunk), this);
 
   GtkWidget* link_align = gtk_alignment_new(0, 0, 0, 0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(link_align),
                             0, 0, kNewProfileLinkLeftPadding, 0);
-  gtk_container_add(GTK_CONTAINER(link_align), new_profile_link);
+  gtk_container_add(GTK_CONTAINER(link_align), new_profile_link_);
 
   gtk_box_pack_start(GTK_BOX(contents_), link_align, FALSE, FALSE, 0);
 }