Revert 255588 "Persist browseraction properties across restarts"

trunk/src/chrome/browser/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_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 50 matching lines @@
 
   // What kind of action is this?
   extensions::ActionInfo::Type action_type() const {
     return action_type_;
   }
 
   // action id -- only used with legacy page actions API
   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);
 
   // Use HasPopup() to see if a popup should be displayed.
   bool HasPopup(int tab_id) const;
 
   // Get the URL to display in a popup.
   GURL GetPopupUrl(int tab_id) const;
 
@@ skipping 91 matching lines @@
   void ClearAllValuesForTab(int tab_id);
 
   // 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);
 
   // Returns icon image with badge for specified tab.
   gfx::ImageSkia GetIconWithBadge(const gfx::ImageSkia& icon,
                                   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.
   // We should probably move this there too.
   int GetIconWidth(int tab_id) const;
 
   template <class T>
   struct ValueTraits {
     static T CreateEmpty() {
       return T();
@@ skipping 54 matching lines @@
   std::map<int, int> declarative_show_count_;
 
   // ExtensionIconSet containing paths to bitmaps from which default icon's
   // image representations will be selected.
   scoped_ptr<const ExtensionIconSet> default_icon_;
 
   // 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_;
 
+  // True if the ExtensionAction's settings have changed from what was
+  // specified in the manifest.
+  bool has_changed_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionAction);
 };
 
 template<>
 struct ExtensionAction::ValueTraits<int> {
   static int CreateEmpty() {
     return -1;
   }
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_ACTION_H_