Revert 255588 "Persist browseraction properties across restarts"

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

 // 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.
 
 #include "chrome/browser/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 32 matching lines @@
     color_utils::HSL shift = {-1, 0, 0.5};
     return gfx::ImageSkiaRep(
         SkBitmapOperations::CreateHSLShiftedBitmap(icon_rep.sk_bitmap(), shift),
         icon_rep.scale());
   }
 
  private:
   const gfx::ImageSkia icon_;
 };
 
-template <class T>
-bool HasValue(const std::map<int, T>& map, int tab_id) {
-  return map.find(tab_id) != map.end();
-}
-
 }  // namespace
 
 const int ExtensionAction::kDefaultTabId = -1;
 
-ExtensionAction::ExtensionAction(const std::string& extension_id,
-                                 extensions::ActionInfo::Type action_type,
-                                 const extensions::ActionInfo& manifest_data)
-    : extension_id_(extension_id), action_type_(action_type) {
+ExtensionAction::ExtensionAction(
+    const std::string& extension_id,
+    extensions::ActionInfo::Type action_type,
+    const extensions::ActionInfo& manifest_data)
+    : extension_id_(extension_id),
+      action_type_(action_type),
+      has_changed_(false) {
   // Page/script actions are hidden/disabled by default, and browser actions are
   // visible/enabled by default.
   SetIsVisible(kDefaultTabId,
                action_type == extensions::ActionInfo::TYPE_BROWSER);
   SetTitle(kDefaultTabId, manifest_data.default_title);
   SetPopupUrl(kDefaultTabId, manifest_data.default_popup_url);
   if (!manifest_data.default_icon.empty()) {
     set_default_icon(make_scoped_ptr(new ExtensionIconSet(
         manifest_data.default_icon)));
   }
@@ skipping 124 matching lines @@
       new IconWithBadgeImageSource(icon,
                                    icon.size(),
                                    spacing,
                                    GetBadgeText(tab_id),
                                    GetBadgeTextColor(tab_id),
                                    GetBadgeBackgroundColor(tab_id),
                                    action_type()),
      icon.size());
 }
 
-bool ExtensionAction::HasPopupUrl(int tab_id) const {
-  return HasValue(popup_url_, tab_id);
-}
-
-bool ExtensionAction::HasTitle(int tab_id) const {
-  return HasValue(title_, tab_id);
-}
-
-bool ExtensionAction::HasBadgeText(int tab_id) const {
-  return HasValue(badge_text_, tab_id);
-}
-
-bool ExtensionAction::HasBadgeBackgroundColor(int tab_id) const {
-  return HasValue(badge_background_color_, tab_id);
-}
-
-bool ExtensionAction::HasBadgeTextColor(int tab_id) const {
-  return HasValue(badge_text_color_, tab_id);
-}
-
-bool ExtensionAction::HasIsVisible(int tab_id) const {
-  return HasValue(is_visible_, tab_id);
-}
-
-bool ExtensionAction::HasIcon(int tab_id) const {
-  return HasValue(icon_, tab_id);
-}
-
 // Determines which icon would be returned by |GetIcon|, and returns its width.
 int ExtensionAction::GetIconWidth(int tab_id) const {
   // If icon has been set, return its width.
   gfx::ImageSkia icon = GetValue(&icon_, tab_id);
   if (!icon.isNull())
     return icon.width();
   // If there is a default icon, the icon width will be set depending on our
   // action type.
   if (default_icon_)
     return GetIconSizeForType(action_type());
 
   // If no icon has been set and there is no default icon, we need favicon
   // width.
   return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_EXTENSIONS_FAVICON).ToImageSkia()->width();
 }