SupportsUserData and manifest handlers for Extension; use them for the Omnibox API.

chrome/common/extensions/extension.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_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/supports_user_data.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
 #include "chrome/common/extensions/permissions/permission_message.h"
 #include "chrome/common/extensions/user_script.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
@@ skipping 23 matching lines @@
 FORWARD_DECLARE_TEST(TabStripModelTest, Apps);
 
 namespace extensions {
 
 class Manifest;
 class PermissionSet;
 
 typedef std::set<std::string> OAuth2Scopes;
 
 // Represents a Chrome extension.
-class Extension : public base::RefCountedThreadSafe<Extension> {
+class Extension : public base::RefCountedThreadSafe<Extension>,
+                  public base::SupportsUserData {
  public:
   struct InstallWarning;
 
   typedef std::map<const std::string, GURL> URLOverrideMap;
   typedef std::vector<std::string> ScriptingWhitelist;
   typedef std::vector<linked_ptr<FileBrowserHandler> > FileBrowserHandlerList;
   typedef std::vector<InstallWarning> InstallWarningVector;
 
   // What an extension was loaded from.
   // NOTE: These values are stored as integers in the preferences and used
@@ skipping 604 matching lines @@
   const ActionInfo* script_badge_info() const {
     return script_badge_info_.get();
   }
   const ActionInfo* page_action_info() const { return page_action_info_.get(); }
   const ActionInfo* browser_action_info() const {
     return browser_action_info_.get();
   }
   const ActionInfo* system_indicator_info() const {
     return system_indicator_info_.get();
   }
-  bool is_verbose_install_message() const {
-    return !omnibox_keyword().empty() ||
-           browser_action_info() ||
-           (page_action_info() &&
-            (page_action_command() ||
-             !page_action_info()->default_icon.empty()));
-  }
   const FileBrowserHandlerList* file_browser_handlers() const {
     return file_browser_handlers_.get();
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
   }
@@ skipping 52 matching lines @@
   }
   const GURL& update_url() const { return update_url_; }
   const ExtensionIconSet& icons() const { return icons_; }
   const extensions::Manifest* manifest() const {
     return manifest_.get();
   }
   const std::string default_locale() const { return default_locale_; }
   const URLOverrideMap& GetChromeURLOverrides() const {
     return chrome_url_overrides_;
   }
-  const std::string omnibox_keyword() const { return omnibox_keyword_; }
   bool incognito_split_mode() const { return incognito_split_mode_; }
   bool offline_enabled() const { return offline_enabled_; }
   const std::vector<TtsVoice>& tts_voices() const { return tts_voices_; }
   const OAuth2Info& oauth2_info() const { return oauth2_info_; }
   const std::vector<webkit_glue::WebIntentServiceData>&
       intents_services() const {
     return intents_services_;
   }
 
   bool wants_file_access() const { return wants_file_access_; }
@@ skipping 85 matching lines @@
                               string16* error);
 
   // 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);
 
   // Returns true if this extension id is from a trusted provider.
   static bool IsTrustedId(const std::string& id);
 
   Extension(const FilePath& path, scoped_ptr<extensions::Manifest> manifest);
-  ~Extension();
+  virtual ~Extension();
 
   // Initialize the extension from a parsed manifest.
   // TODO(aa): Rename to just Init()? There's no Value here anymore.
   // TODO(aa): It is really weird the way this class essentially contains a copy
   // of the underlying DictionaryValue in its members. We should decide to
   // either wrap the DictionaryValue and go with that only, or we should parse
   // into strong types and discard the value. But doing both is bad.
   bool InitFromValue(int flags, string16* error);
 
   // The following are helpers for InitFromValue to load various features of the
@@ skipping 49 matching lines @@
   bool LoadWebIntentAction(const std::string& action_name,
                            const base::DictionaryValue& intent_service,
                            string16* error);
   bool LoadWebIntentServices(string16* error);
   bool LoadFileHandler(const std::string& handler_id,
                        const base::DictionaryValue& handler_info,
                        string16* error);
   bool LoadFileHandlers(string16* error);
   bool LoadExtensionFeatures(APIPermissionSet* api_permissions,
                              string16* error);
+  bool LoadManifestHandlerFeatures(string16* error);
   bool LoadDevToolsPage(string16* error);
   bool LoadInputComponents(const APIPermissionSet& api_permissions,
                            string16* error);
   bool LoadContentScripts(string16* error);
   bool LoadPageAction(string16* error);
   bool LoadBrowserAction(string16* error);
   bool LoadScriptBadge(string16* error);
   bool LoadSystemIndicator(APIPermissionSet* api_permissions, string16* error);
   bool LoadFileBrowserHandlers(string16* error);
   // Helper method to load a FileBrowserHandlerList from the manifest.
   FileBrowserHandlerList* LoadFileBrowserHandlersHelper(
       const base::ListValue* extension_actions, string16* error);
   // Helper method to load an FileBrowserHandler from manifest.
   FileBrowserHandler* LoadFileBrowserHandler(
       const base::DictionaryValue* file_browser_handlers, string16* error);
   bool LoadChromeURLOverrides(string16* error);
-  bool LoadOmnibox(string16* error);
   bool LoadTextToSpeechVoices(string16* error);
   bool LoadIncognitoMode(string16* error);
   bool LoadContentSecurityPolicy(string16* error);
 
   bool LoadThemeFeatures(string16* error);
   bool LoadThemeImages(const base::DictionaryValue* theme_value,
                        string16* error);
   bool LoadThemeColors(const base::DictionaryValue* theme_value,
                        string16* error);
   bool LoadThemeTints(const base::DictionaryValue* theme_value,
@@ skipping 250 matching lines @@
   // containers like panels and windows.
   int launch_width_;
   int launch_height_;
 
   // Should this app be shown in the app launcher.
   bool display_in_launcher_;
 
   // Should this app be shown in the browser New Tab Page.
   bool display_in_new_tab_page_;
 
-  // The Omnibox keyword for this extension, or empty if there is none.
-  std::string omnibox_keyword_;
-
   // List of text-to-speech voices that this extension provides, if any.
   std::vector<TtsVoice> tts_voices_;
 
   // The OAuth2 client id and scopes, if specified by the extension.
   OAuth2Info oauth2_info_;
 
   // List of intent services that this extension provides, if any.
   std::vector<webkit_glue::WebIntentServiceData> intents_services_;
 
   // List of file handlers associated with this extension, if any.
@@ skipping 75 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_