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 97 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 BrowserActionButton::BrowserActionButton(const Extension* extension,
                                          Browser* browser,
                                          BrowserActionView::Delegate* delegate)
     : MenuButton(this, base::string16(), NULL, false),
       browser_(browser),
+      icon_observer_(NULL),

[Finnur, 2014/02/10 11:20:57]

Move this line down one to avoid compile error seen on Linux try bot.

       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) {
   SetBorder(views::Border::NullBorder());
   set_alignment(TextButton::ALIGN_CENTER);
@@ skipping 176 matching lines @@
       UpdateState();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void BrowserActionButton::OnIconUpdated() {
   UpdateState();
+  if (icon_observer_) {
+    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);

[Finnur, 2014/02/10 10:41:41]

This is copied almost verbatim from GetIconWithBadge, but needs to be kept in
sync. Can you instead extract this into a helper function that both call? Have
it take for example a |tab_id| and an |icon_factory| as params.

+    icon_observer_->OnIconUpdated(
+        browser_action_->GetIconWithBadge(icon, tab_id, spacing));
+  }
 }
 
 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);
   }
 }