Implement browserAction.setIcon(ImageData) for extensions.

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2006-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/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
@@ skipping 142 matching lines @@
 void BrowserActionImageView::OnImageLoaded(SkBitmap* image, size_t index) {
   DCHECK(index < browser_action_icons_.size());
   browser_action_icons_[index] = *image;
   if (index == browser_action_icons_.size() - 1) {
     OnStateUpdated();
     tracker_ = NULL;  // The tracker object will delete itself when we return.
   }
 }
 
 void BrowserActionImageView::OnStateUpdated() {
-  SkBitmap* image = &browser_action_icons_[browser_action_state_->icon_index()];
+  SkBitmap* image = browser_action_state_->icon();
+  if (!image)
+    image = &browser_action_icons_[browser_action_state_->icon_index()];
   SetIcon(*image);
   SetTooltipText(ASCIIToWide(browser_action_state_->title()));
   panel_->OnBrowserActionVisibilityChanged();
   SchedulePaint();
 }
 
 void BrowserActionImageView::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED) {
@@ skipping 314 matching lines @@
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->clipRect(rect);
   canvas->drawText(text.c_str(), text.size(),
                    rect.fLeft + (rect.width() - text_width) / 2,
                    rect.fTop + kTextSize + 1,
                    text_paint);
   canvas->restore();
 }