| Index: chrome/browser/extensions/extension_action.h
|
| diff --git a/chrome/browser/extensions/extension_action.h b/chrome/browser/extensions/extension_action.h
|
| index 69095b4aa541c6d6acf28d1ce0ef04fea19bb455..fb6dc270c53fb06f7431d8889611ba3b9a416f1e 100644
|
| --- a/chrome/browser/extensions/extension_action.h
|
| +++ b/chrome/browser/extensions/extension_action.h
|
| @@ -68,9 +68,6 @@ class ExtensionAction {
|
| std::string id() const { return id_; }
|
| void set_id(const std::string& id) { id_ = id; }
|
|
|
| - bool has_changed() const { return has_changed_; }
|
| - void set_has_changed(bool value) { has_changed_ = value; }
|
| -
|
| // Set the url which the popup will load when the user clicks this action's
|
| // icon. Setting an empty URL will disable the popup for a given tab.
|
| void SetPopupUrl(int tab_id, const GURL& url);
|
| @@ -182,6 +179,16 @@ class ExtensionAction {
|
| int tab_id,
|
| const gfx::Size& spacing) const;
|
|
|
| + // Determine whether or not the ExtensionAction has default values for each
|
| + // property.
|
| + bool HasDefaultPopupUrl() const;
|
| + bool HasDefaultTitle() const;
|
| + bool HasDefaultBadgeText() const;
|
| + bool HasDefaultBadgeBackgroundColor() const;
|
| + bool HasDefaultBadgeTextColor() const;
|
| + bool HasDefaultIsVisible() const;
|
| + bool HasDefaultIcon() const;
|
| +
|
| private:
|
| // Returns width of the current icon for tab_id.
|
| // TODO(tbarzic): The icon selection is done in ExtensionActionIconFactory.
|
| @@ -256,10 +263,6 @@ class ExtensionAction {
|
| // needed for compat with an older version of the page actions API.
|
| std::string id_;
|
|
|
| - // True if the ExtensionAction's settings have changed from what was
|
| - // specified in the manifest.
|
| - bool has_changed_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionAction);
|
| };
|
|
|
|
|