Kill Extension::RuntimeData and move its guts to ExtensionsService.

chrome/common/extensions/extension.h

 // Copyright (c) 2010 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_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 82 matching lines @@
     TYPE_HOSTED_APP,
     TYPE_PACKAGED_APP
   };
 
   // An NPAPI plugin included in the extension.
   struct PluginInfo {
     FilePath path;  // Path to the plugin.
     bool is_public;  // False if only this extension can load this plugin.
   };
 
-  // Contains the subset of the extension's (private) data that can be modified
-  // after initialization. This class should only be accessed on the UI thread.
-  struct RuntimeData {
-    // We keep a cache of images loaded from extension resources based on their
-    // path and a string representation of a size that may have been used to
-    // scale it (or the empty string if the image is at its original size).
-    typedef std::pair<FilePath, std::string> ImageCacheKey;
-    typedef std::map<ImageCacheKey, SkBitmap> ImageCache;
-
-    RuntimeData();
-    ~RuntimeData();
-
-    // True if the background page is ready.
-    bool background_page_ready;
-
-    // True while the extension is being upgraded.
-    bool being_upgraded;
-
-    // Cached images for this extension.
-    ImageCache image_cache_;
-  };
-
   // A permission is defined by its |name| (what is used in the manifest),
   // and the |message_id| that's used by install/update UI.
   struct Permission {
     const char* const name;
     const int message_id;
   };
 
   static scoped_refptr<Extension> Create(const FilePath& path,
                                          Location location,
                                          const DictionaryValue& value,
@@ skipping 298 matching lines @@
 
   // Theme-related.
   bool is_theme() const { return is_theme_; }
   DictionaryValue* GetThemeImages() const { return theme_images_.get(); }
   DictionaryValue* GetThemeColors() const {return theme_colors_.get(); }
   DictionaryValue* GetThemeTints() const { return theme_tints_.get(); }
   DictionaryValue* GetThemeDisplayProperties() const {
     return theme_display_properties_.get();
   }
 
-  // Whether the background page, if any, is ready. We don't load other
-  // components until then. If there is no background page, we consider it to
-  // be ready.
-  bool GetBackgroundPageReady() const;
-  void SetBackgroundPageReady() const;
-
-  // Getter and setter for the flag that specifies whether the extension is
-  // being upgraded.
-  bool being_upgraded() const { return GetRuntimeData()->being_upgraded; }
-  void set_being_upgraded(bool value) const {
-    GetRuntimeData()->being_upgraded = value;
-  }
-
  private:
   friend class base::RefCountedThreadSafe<Extension>;
 
+  // We keep a cache of images loaded from extension resources based on their
+  // path and a string representation of a size that may have been used to
+  // scale it (or the empty string if the image is at its original size).
+  typedef std::pair<FilePath, std::string> ImageCacheKey;
+  typedef std::map<ImageCacheKey, SkBitmap> ImageCache;
+
   // Normalize the path for use by the extension. On Windows, this will make
   // sure the drive letter is uppercase.
   static FilePath MaybeNormalizePath(const FilePath& path);
 
   Extension(const FilePath& path, Location location);
   ~Extension();
 
   // Initialize the extension from a parsed manifest.
   // Usually, the id of an extension is generated by the "key" property of
   // its manifest, but if |require_key| is |false|, a temporary ID will be
@@ skipping 56 matching lines @@
   // The set of unique API install messages that the extension has.
   // NOTE: This only includes messages related to permissions declared in the
   // "permissions" key in the manifest.  Permissions implied from other features
   // of the manifest, like plugins and content scripts are not included.
   std::set<string16> GetSimplePermissionMessages() const;
 
   // The permission message displayed related to the host permissions for
   // this extension.
   string16 GetHostPermissionMessage() const;
 
-  // Returns a mutable pointer to our runtime data. Can only be called on
-  // the UI thread.
-  RuntimeData* GetRuntimeData() const;
-
-  // Runtime data.
-  const RuntimeData runtime_data_;
+  // Cached images for this extension. This should only be touched on the UI
+  // thread.
+  mutable ImageCache image_cache_;
 
   // A persistent, globally unique ID. An extension's ID is used in things
   // like directory structures and URLs, and is expected to not change across
   // versions. It is generated as a SHA-256 hash of the extension's public
   // key, or as a hash of the path in the case of unpacked extensions.
   std::string id_;
 
   // The extension's human-readable name. Name is used for display purpose. It
   // might be wrapped with unicode bidi control characters so that it is
   // displayed correctly in RTL context.
@@ skipping 162 matching lines @@
   std::set<std::string> extension_api_permissions;
   // TODO(akalin): Once we have a unified ExtensionType, replace the
   // below member variables with a member of that type.
   bool is_theme;
   bool is_app;
   bool converted_from_user_script;
   GURL update_url;
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_