summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/browser_actions_container.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/browser_actions_container.h')
-rw-r--r--chrome/browser/views/browser_actions_container.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index cd308c2..f133515 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.h
@@ -76,9 +76,6 @@ class BrowserActionButton : public views::MenuButton,
virtual void PopupDidHide();
private:
- // If the image from the browser action needs to be loaded, load it.
- void LoadImage();
-
// The browser action this view represents. The ExtensionAction is not owned
// by this class.
ExtensionAction* browser_action_;
@@ -86,14 +83,15 @@ class BrowserActionButton : public views::MenuButton,
// The extension associated with the browser action we're displaying.
Extension* extension_;
- // The icons representing different states for the browser action.
- std::vector<SkBitmap> browser_action_icons_;
-
// The object that is waiting for the image loading to complete
// asynchronously. This object can potentially outlive the BrowserActionView,
// and takes care of deleting itself.
ImageLoadingTracker* tracker_;
+ // The default icon for our browser action. This might be non-empty if the
+ // browser action had a value for default_icon in the manifest.
+ SkBitmap default_icon_;
+
// The browser action shelf.
BrowserActionsContainer* panel_;