Add notification mechanism when BrowserActionButton's icon has been updated.

chrome/browser/ui/views/toolbar/browser_action_view.cc

 // Copyright 2013 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/views/toolbar/browser_action_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
@@ skipping 45 matching lines @@
   button_->set_owned_by_client();
   AddChildView(button_);
   button_->UpdateState();
 }
 
 BrowserActionView::~BrowserActionView() {
   button_->Destroy();
 }
 
 gfx::ImageSkia BrowserActionView::GetIconWithBadge() {
-  int tab_id = delegate_->GetCurrentTabId();
-
-  const ExtensionAction* action =
-      extensions::ExtensionActionManager::Get(browser_->profile())->
-      GetBrowserAction(*button_->extension());
-  gfx::Size spacing(0, ToolbarView::kVertSpacing);
-  gfx::ImageSkia icon = *button_->icon_factory().GetIcon(tab_id).ToImageSkia();
-  if (!button_->IsEnabled(tab_id))
-    icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
-  return action->GetIconWithBadge(icon, tab_id, spacing);
+  return button_->GetIconWithBadge();
 }
 
 void BrowserActionView::Layout() {
   // We can't rely on button_->GetPreferredSize() here because that's not set
   // correctly until the first call to
   // BrowserActionsContainer::RefreshBrowserActionViews(), whereas this can be
   // called before that when the initial bounds are set (and then not after,
   // since the bounds don't change).  So instead of setting the height from the
   // button's preferred size, we use IconHeight(), since that's how big the
   // button should be regardless of what it's displaying.
@@ skipping 29 matching lines @@
                                          BrowserActionView::Delegate* delegate)
     : MenuButton(this, base::string16(), NULL, false),
       browser_(browser),
       browser_action_(
           extensions::ExtensionActionManager::Get(browser->profile())->
           GetBrowserAction(*extension)),
       extension_(extension),
       icon_factory_(browser->profile(), extension, browser_action_, this),
       delegate_(delegate),
       context_menu_(NULL),
-      called_registered_extension_command_(false) {
+      called_registered_extension_command_(false),
+      icon_observer_(NULL) {
   SetBorder(views::Border::NullBorder());
   set_alignment(TextButton::ALIGN_CENTER);
   set_context_menu_controller(this);
 
   // No UpdateState() here because View hierarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   content::NotificationSource notification_source =
       content::Source<Profile>(browser_->profile()->GetOriginalProfile());
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
@@ skipping 168 matching lines @@
       UpdateState();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void BrowserActionButton::OnIconUpdated() {
   UpdateState();
+  if (icon_observer_)
+    icon_observer_->OnIconUpdated(GetIconWithBadge());
 }
 
 bool BrowserActionButton::Activate() {
   if (!IsPopup())
     return true;
 
   delegate_->OnBrowserActionExecuted(this);
 
   // TODO(erikkay): Run a nested modal loop while the mouse is down to
   // enable menu-like drag-select behavior.
@@ skipping 102 matching lines @@
   extensions::Command browser_action_command;
   if (!only_if_active || !command_service->GetBrowserActionCommand(
           extension_->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &browser_action_command,
           NULL)) {
     GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
     keybinding_.reset(NULL);
   }
 }
+
+gfx::ImageSkia BrowserActionButton::GetIconWithBadge() {
+  int tab_id = delegate_->GetCurrentTabId();
+  gfx::Size spacing(0, ToolbarView::kVertSpacing);
+  gfx::ImageSkia icon = *icon_factory_.GetIcon(tab_id).ToImageSkia();
+  if (!IsEnabled(tab_id))
+    icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
+  return browser_action_->GetIconWithBadge(icon, tab_id, spacing);
+}

[Finnur, 2014/02/12 11:19:52]

This function is declared above GetIconForTest() in the .h file and should
therefore be moved above it in this file (line 390).