Beginnings of the script bubble.

chrome/browser/extensions/component_loader.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_COMPONENT_LOADER_H_
 #define CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
  public:
   ComponentLoader(ExtensionServiceInterface* extension_service,
                   PrefService* prefs,
                   PrefService* local_state);
   virtual ~ComponentLoader();
 
   size_t registered_extensions_count() const {
     return component_extensions_.size();
   }
 
+  const Extension* GetScriptBubble() const;
+
   // Loads any registered component extensions.
   void LoadAll();
 
   // Registers and possibly loads a component extension. If ExtensionService
   // has been initialized, the extension is loaded; otherwise, the load is
   // deferred until LoadAll is called.

[Yoyo Zhou, 2012/10/02 01:21:01]

Should have a note about what it's returning.

[Aaron Boodman, 2012/10/02 01:42:22]

Done with last patchset.

-  const Extension* Add(const std::string& manifest_contents,
-                       const FilePath& root_directory);
+  std::string Add(const std::string& manifest_contents,

[Jeffrey Yasskin, 2012/10/02 00:26:31]

Comment the meaning of the returned string, please.

[Aaron Boodman, 2012/10/02 01:28:52]

Done.

[Aaron Boodman, 2012/10/02 01:28:52]

Done.

+                  const FilePath& root_directory);
 
   // Convenience method for registering a component extension by resource id.
-  const Extension* Add(int manifest_resource_id,
-                       const FilePath& root_directory);
+  std::string Add(int manifest_resource_id,
+                  const FilePath& root_directory);
 
   // Loads a component extension from file system. Replaces previously added
   // extension with the same ID.
-  const Extension* AddOrReplace(const FilePath& path);
+  std::string AddOrReplace(const FilePath& path);
 
   // Returns true if an extension with the specified id has been added.
   bool Exists(const std::string& id) const;
 
   // Unloads a component extension and removes it from the list of component
   // extensions to be loaded.
   void Remove(const FilePath& root_directory);
   void Remove(const std::string& id);
 
   // Adds the default component extensions.
@@ skipping 16 matching lines @@
   // Parse the given JSON manifest. Returns NULL if it cannot be parsed, or if
   // if the result is not a DictionaryValue.
   DictionaryValue* ParseManifest(const std::string& manifest_contents) const;
 
   // Clear the list of registered extensions.
   void ClearAllRegistered();
 
   // Reloads a registered component extension.
   void Reload(const std::string& extension_id);
 
+  void AddScriptBubble();

[Jeffrey Yasskin, 2012/10/02 00:26:31]

Comment what this function does, and possibly how it differs from
GetScriptBubble in a way that makes both necessary.

[Yoyo Zhou, 2012/10/02 01:21:01]

This should be private.

[Aaron Boodman, 2012/10/02 01:28:52]

Done.

[Aaron Boodman, 2012/10/02 01:42:22]

It's called by the unit tests. This is necessary because I don't want to
accidentally start testing other component extension behavior over time.

+
  private:
   // Information about a registered component extension.
   struct ComponentExtensionInfo {
     ComponentExtensionInfo(const DictionaryValue* manifest,
-                           const FilePath& root_directory)
-        : manifest(manifest),
-          root_directory(root_directory) {
-    }
+                           const FilePath& root_directory);
 
     // The parsed contents of the extensions's manifest file.
     const DictionaryValue* manifest;
 
     // Directory where the extension is stored.
     FilePath root_directory;
+
+    // The component extension's ID.
+    std::string id;

[Jeffrey Yasskin, 2012/10/02 00:26:31]

optional: I'd prefer "extension_id" here since it's not the
ComponentExtensionInfo's id.

[Aaron Boodman, 2012/10/02 01:28:52]

Done.

   };
 
-  const Extension* Add(const DictionaryValue* parsed_manifest,
-                       const FilePath& root_directory);
+  std::string Add(const DictionaryValue* parsed_manifest,
+                  const FilePath& root_directory);
 
   // Loads a registered component extension.
   const Extension* Load(const ComponentExtensionInfo& info);
 
   void AddFileManagerExtension();
 
 #if defined(OS_CHROMEOS)
   void AddGaiaAuthExtension();
 #endif
 
   // Add the enterprise webstore extension, or reload it if already loaded.
   void AddOrReloadEnterpriseWebStore();
 
   void AddChromeApp();
 
-  // Determine the extension id.
-  static std::string GenerateId(const base::DictionaryValue* manifest);
-
   PrefService* prefs_;
   PrefService* local_state_;
 
   ExtensionServiceInterface* extension_service_;
 
   // List of registered component extensions (see Extension::Location).
   typedef std::vector<ComponentExtensionInfo> RegisteredComponentExtensions;
   RegisteredComponentExtensions component_extensions_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
+  std::string script_bubble_id_;
+
   DISALLOW_COPY_AND_ASSIGN(ComponentLoader);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_