[Extensions UI] Clean up extension icon generation

chrome/browser/ui/extensions/extension_action_view_controller.cc

 // Copyright 2014 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/extensions/extension_action_view_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
+#include "chrome/common/icon_with_badge_image_source.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 using extensions::ActionInfo;
 using extensions::CommandService;
@@ skipping 38 matching lines @@
     platform_delegate_->OnDelegateSet();
   } else {
     if (is_showing_popup())
       HidePopup();
     platform_delegate_.reset();
     view_delegate_ = nullptr;
   }
 }
 
 gfx::Image ExtensionActionViewController::GetIcon(
-    content::WebContents* web_contents) {
+    content::WebContents* web_contents,
+    const gfx::Size& size) {
   if (!ExtensionIsValid())
     return gfx::Image();
 
-  return icon_factory_.GetIcon(SessionTabHelper::IdForTab(web_contents));
-}
+  int tab_id = SessionTabHelper::IdForTab(web_contents);
+  scoped_ptr<IconWithBadgeImageSource> image_source(
+      new IconWithBadgeImageSource(size));
+  image_source->SetIcon(icon_factory_.GetIcon(tab_id));
+  scoped_ptr<IconWithBadgeImageSource::Badge> badge;
+  std::string badge_text = extension_action_->GetBadgeText(tab_id);
+  if (!badge_text.empty()) {
+    badge.reset(new IconWithBadgeImageSource::Badge(
+            badge_text,
+            extension_action_->GetBadgeTextColor(tab_id),
+            extension_action_->GetBadgeBackgroundColor(tab_id)));
+  }
+  image_source->SetBadge(badge.Pass());
 
-gfx::ImageSkia ExtensionActionViewController::GetIconWithBadge() {
-  if (!ExtensionIsValid())
-    return gfx::ImageSkia();
-
-  content::WebContents* web_contents = view_delegate_->GetCurrentWebContents();
-  gfx::Size spacing(0, 3);
-  gfx::ImageSkia icon = *GetIcon(web_contents).ToImageSkia();
-  if (!IsEnabled(web_contents))
-    icon = gfx::ImageSkiaOperations::CreateTransparentImage(icon, .25);
-  return extension_action_->GetIconWithBadge(
-      icon, SessionTabHelper::IdForTab(web_contents), spacing);
+  return gfx::Image(gfx::ImageSkia(image_source.release(), size));
 }
 
 base::string16 ExtensionActionViewController::GetActionName() const {
   if (!ExtensionIsValid())
     return base::string16();
 
   return base::UTF8ToUTF16(extension_->name());
 }
 
 base::string16 ExtensionActionViewController::GetAccessibleName(
@@ skipping 104 matching lines @@
               extension_.get(), browser_, grant_tab_permissions) ==
       ExtensionAction::ACTION_SHOW_POPUP) {
     GURL popup_url = extension_action_->GetPopupUrl(
         SessionTabHelper::IdForTab(view_delegate_->GetCurrentWebContents()));
     return GetPreferredPopupViewController()
         ->TriggerPopupWithUrl(show_action, popup_url, grant_tab_permissions);
   }
   return false;
 }
 
-void ExtensionActionViewController::PaintExtra(
-    gfx::Canvas* canvas,
-    const gfx::Rect& bounds,
-    content::WebContents* web_contents) const {
-  if (!ExtensionIsValid())
-    return;
-
-  int tab_id = SessionTabHelper::IdForTab(web_contents);
-  if (tab_id >= 0)
-    extension_action_->PaintBadge(canvas, bounds, tab_id);
-}
-
 void ExtensionActionViewController::RegisterCommand() {
   if (!ExtensionIsValid())
     return;
 
   platform_delegate_->RegisterCommand();
 }
 
 void ExtensionActionViewController::InspectPopup() {
   ExecuteAction(SHOW_POPUP_AND_INSPECT, true);
 }
@@ skipping 115 matching lines @@
   popup_host_observer_.Remove(popup_host_);
   popup_host_ = nullptr;
   if (toolbar_actions_bar_) {
     toolbar_actions_bar_->SetPopupOwner(nullptr);
     if (toolbar_actions_bar_->popped_out_action() == this &&
         !view_delegate_->IsMenuRunning())
       toolbar_actions_bar_->UndoPopOut();
   }
   view_delegate_->OnPopupClosed();
 }