Turn pageAction.show -> browserAction.sensibleThing.

chrome/common/extensions/extension_action.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/common/extensions/icon_transform.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/linear_animation.h"
 
 class GURL;
 class SkBitmap;
-class SkDevice;
 
 namespace gfx {
 class Canvas;
 class Rect;
 }
 
 // ExtensionAction encapsulates the state of a browser action, page action, or
 // script badge.
 // Instances can have both global and per-tab state. If a property does not have
 // a per-tab value, the global value is used instead.
@@ skipping 52 matching lines @@
     void RemoveObserver(Observer* observer);
 
    private:
     // Construct using ExtensionAction::RunIconAnimation().
     friend class ExtensionAction;
     explicit IconAnimation(ui::AnimationDelegate* delegate);
 
     // ui::LinearAnimation implementation.
     virtual void AnimateToState(double state) OVERRIDE;
 
-    // Device we use to paint icons to.
-    mutable scoped_ptr<SkDevice> device_;
+    // Transformation to apply to the icon when rendered.
+    mutable extensions::IconTransform icon_transform_;
 
     ObserverList<Observer> observers_;
 
     DISALLOW_COPY_AND_ASSIGN(IconAnimation);
   };
 
   ExtensionAction(const std::string& extension_id, Type action_type);
   ~ExtensionAction();
 
   // Gets a copy of this, ownership passed to caller.
@@ skipping 109 matching lines @@
   // If the specified tab has a badge, paint it into the provided bounds.
   void PaintBadge(gfx::Canvas* canvas, const gfx::Rect& bounds, int tab_id);
 
   // Gets a weak reference to the icon animation for a tab, if any. The
   // reference will only have a value while the animation is running.
   base::WeakPtr<IconAnimation> GetIconAnimation(int tab_id) const;
 
   // Runs an animation on a tab.
   void RunIconAnimation(int tab_id);
 
+  // Renders |icon| in the "visible" state for |tab_id|: if visible then
+  // normal, if invisible then faded. This function only makes sense for
+  // browser actions; for page actions, not-visibile should imply not showing at
+  // all for that tab.
+  const SkBitmap& RenderIconVisibility(const SkBitmap& icon, int tab_id) const;
+
  private:
   template <class T>
   struct ValueTraits {
     static T CreateEmpty() {
       return T();
     }
   };
 
   template<class T>
   void SetValue(std::map<int, T>* map, int tab_id, const T& val) {
@@ skipping 34 matching lines @@
   std::string default_icon_path_;
 
   // The id for the ExtensionAction, for example: "RssPageAction". This is
   // needed for compat with an older version of the page actions API.
   std::string id_;
 
   // A list of paths to icons this action might show. This is needed to support
   // the legacy setIcon({iconIndex:...} method of the page actions API.
   std::vector<std::string> icon_paths_;
 
+  // Transformation to apply to the icon when rendered.
+  mutable extensions::IconTransform icon_transform_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionAction);
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_ACTION_H_