Turn pageAction.show -> browserAction.sensibleThing.

chrome/common/extensions/extension_action.cc

 // Copyright (c) 2012 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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/common/badge_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // Different platforms need slightly different constants to look good.
 #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
@@ skipping 66 matching lines @@
 
 ExtensionAction::IconAnimation::IconAnimation(
     ui::AnimationDelegate* delegate)
     // 100ms animation at 50fps (so 5 animation frames in total).
     : ui::LinearAnimation(100, 50, delegate) {}
 
 ExtensionAction::IconAnimation::~IconAnimation() {}
 
 const SkBitmap& ExtensionAction::IconAnimation::Apply(
     const SkBitmap& icon) const {
-  DCHECK_GT(icon.width(), 0);
-  DCHECK_GT(icon.height(), 0);
-
-  if (!device_.get() ||
-      (device_->width() != icon.width()) ||
-      (device_->height() != icon.height())) {
-    device_.reset(new SkDevice(
-      SkBitmap::kARGB_8888_Config, icon.width(), icon.height(), true));
-  }
-
-  SkCanvas canvas(device_.get());
-  canvas.clear(SK_ColorWHITE);
-  SkPaint paint;
-  paint.setAlpha(CurrentValueBetween(0, 255));
-  canvas.drawBitmap(icon, 0, 0, &paint);
-  return device_->accessBitmap(false);
+  return icon_transform_.set_alpha(CurrentValueBetween(0, 255))
+                        .RenderIcon(icon);
 }
 
 void ExtensionAction::IconAnimation::AddObserver(
     ExtensionAction::IconAnimation::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ExtensionAction::IconAnimation::RemoveObserver(
     ExtensionAction::IconAnimation::Observer* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 185 matching lines @@
   return (it != icon_animation_.end()) ? it->second->animation()->AsWeakPtr()
                                        : base::WeakPtr<IconAnimation>();
 }
 
 void ExtensionAction::RunIconAnimation(int tab_id) {
   IconAnimationWrapper* icon_animation =
       new IconAnimationWrapper(this, tab_id);
   icon_animation_[tab_id] = make_linked_ptr(icon_animation);
   icon_animation->animation()->Start();
 }
+
+const SkBitmap& ExtensionAction::RenderIconVisibility(const SkBitmap& icon,
+                                                      int tab_id) const {
+  if (GetIsVisible(tab_id))
+    return icon;
+  return icon_transform_.set_alpha(63)
+                        .RenderIcon(icon);
+}