Revert 255588 "Persist browseraction properties across restarts"

trunk/src/chrome/browser/extensions/extension_action.h

Index: trunk/src/chrome/browser/extensions/extension_action.h
===================================================================
--- trunk/src/chrome/browser/extensions/extension_action.h	(revision 255654)
+++ trunk/src/chrome/browser/extensions/extension_action.h	(working copy)
@@ -68,6 +68,9 @@
   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);
@@ -179,16 +182,6 @@
                                   int tab_id,
                                   const gfx::Size& spacing) const;
 
-  // Determine whether or not the ExtensionAction has a value set for the given
-  // |tab_id| for each property.
-  bool HasPopupUrl(int tab_id) const;
-  bool HasTitle(int tab_id) const;
-  bool HasBadgeText(int tab_id) const;
-  bool HasBadgeBackgroundColor(int tab_id) const;
-  bool HasBadgeTextColor(int tab_id) const;
-  bool HasIsVisible(int tab_id) const;
-  bool HasIcon(int tab_id) const;
-
  private:
   // Returns width of the current icon for tab_id.
   // TODO(tbarzic): The icon selection is done in ExtensionActionIconFactory.
@@ -263,6 +256,10 @@
   // 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);
 };