add mole info to toolstrip definition and enable moles

chrome/common/extensions/extension.h

 // Copyright (c) 2009 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_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 36 matching lines @@
 
   // Icon sizes used by the extension system.
   static const int kKnownIconSizes[];
 
   // 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.
   };
 
+  // A toolstrip and its associated mole.
+  struct ToolstripInfo {
+    ToolstripInfo() : mole_height(0) {}
+
+    GURL toolstrip;
+    GURL mole;
+    int mole_height;
+  };
+
   // The name of the manifest inside an extension.
   static const char kManifestFilename[];
 
 #if defined(OS_WIN)
   static const char* kExtensionRegistryPath;
 #endif
 
   // The number of bytes in a legal id.
   static const size_t kIdSize;
 
@@ skipping 73 matching lines @@
   const Version* version() const { return version_.get(); }
   // String representation of the version number.
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   const PageActionMap& page_actions() const { return page_actions_; }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const GURL& background_url() const { return background_url_; }
-  const std::vector<std::string>& toolstrips() const { return toolstrips_; }
+  const std::vector<ToolstripInfo>& toolstrips() const { return toolstrips_; }
   const std::vector<URLPattern>& permissions() const { return permissions_; }
   const GURL& update_url() const { return update_url_; }
   const std::map<int, std::string>& icons() { return icons_; }
 
   // Retrieves a page action by |id|.
   const PageAction* GetPageAction(std::string id) const;
 
   // Returns the origin of this extension. This function takes a |registry_path|
   // so that the registry location can be overwritten during testing.
   Location ExternalExtensionInstallType(std::string registry_path);
@@ skipping 69 matching lines @@
   // A list of page actions.
   PageActionMap page_actions_;
 
   // Optional list of NPAPI plugins and associated properties.
   std::vector<PluginInfo> plugins_;
 
   // Optional URL to a master page of which a single instance should be always
   // loaded in the background.
   GURL background_url_;
 
-  // Paths to HTML files to be displayed in the toolbar.
-  std::vector<std::string> toolstrips_;
+  // Optional list of toolstrips_ and associated properties.
+  std::vector<ToolstripInfo> toolstrips_;
 
   // The public key ('key' in the manifest) used to sign the contents of the
   // crx package ('signature' in the manifest)
   std::string public_key_;
 
   // A map of resource id's to relative file paths.
   scoped_ptr<DictionaryValue> theme_images_;
 
   // A map of color names to colors.
   scoped_ptr<DictionaryValue> theme_colors_;
@@ skipping 15 matching lines @@
 
   // URL for fetching an update manifest
   GURL update_url_;
 
   FRIEND_TEST(ExtensionTest, LoadPageActionHelper);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_