Move the parsing of 'update_url' & 'options_page' URLs out of Extension.

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>
@@ skipping 720 matching lines @@
   }
   const std::vector<std::string>& background_scripts() const {
     return background_scripts_;
   }
   bool has_persistent_background_page() const {
     return has_background_page() && background_page_is_persistent_;
   }
   bool has_lazy_background_page() const {
     return has_background_page() && !background_page_is_persistent_;
   }
-  const GURL& options_url() const { return options_url_; }
   const GURL& details_url() const { return details_url_;}
   const PermissionSet* optional_permission_set() const {
     return optional_permission_set_.get();
   }
   const PermissionSet* required_permission_set() const {
     return required_permission_set_.get();
   }
   // Appends |new_warnings| to install_warnings().
   void AddInstallWarnings(const InstallWarningVector& new_warnings);
   const InstallWarningVector& install_warnings() const {
     return install_warnings_;
   }
-  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_;
   }
   bool incognito_split_mode() const { return incognito_split_mode_; }
   bool offline_enabled() const { return offline_enabled_; }
@@ skipping 128 matching lines @@
                   const char* list_error,
                   const char* value_error,
                   string16* error);
   bool LoadLaunchContainer(string16* error);
   bool LoadLaunchURL(string16* error);
 
   bool LoadSharedFeatures(const APIPermissionSet& api_permissions,
                           string16* error);
   bool LoadDescription(string16* error);
   bool LoadManifestVersion(string16* error);
-  bool LoadUpdateURL(string16* error);
   bool LoadIcons(string16* error);
   bool LoadCommands(string16* error);
   bool LoadPlugins(string16* error);
   bool LoadNaClModules(string16* error);
   bool LoadWebAccessibleResources(string16* error);
   bool LoadSandboxedPages(string16* error);
   // Must be called after LoadPlugins().
   bool LoadRequirements(string16* error);
   bool LoadDefaultLocale(string16* error);
   bool LoadOfflineEnabled(string16* error);
-  bool LoadOptionsPage(string16* error);
   bool LoadBackgroundScripts(string16* error);
   bool LoadBackgroundScripts(const std::string& key, string16* error);
   bool LoadBackgroundPage(const APIPermissionSet& api_permissions,
                           string16* error);
   bool LoadBackgroundPage(const std::string& key,
                           const APIPermissionSet& api_permissions,
                           string16* error);
   bool LoadBackgroundPersistent(
       const APIPermissionSet& api_permissions,
       string16* error);
@@ skipping 214 matching lines @@
   // True if the background page should stay loaded forever; false if it should
   // load on-demand (when it needs to handle an event). Defaults to true.
   bool background_page_is_persistent_;
 
   // True if the background page can be scripted by pages of the app or
   // extension, in which case all such pages must run in the same process.
   // False if such pages are not permitted to script the background page,
   // allowing them to run in different processes.
   bool allow_background_js_access_;
 
-  // Optional URL to a page for setting options/preferences.
-  GURL options_url_;
-
   // URL to the webstore page of the extension.
   GURL details_url_;
 
   // The public key used to sign the contents of the crx package.
   std::string public_key_;
 
   // A map of resource id's to relative file paths.
   scoped_ptr<base::DictionaryValue> theme_images_;
 
   // A map of color names to colors.
   scoped_ptr<base::DictionaryValue> theme_colors_;
 
   // A map of color names to colors.
   scoped_ptr<base::DictionaryValue> theme_tints_;
 
   // A map of display properties.
   scoped_ptr<base::DictionaryValue> theme_display_properties_;
 
-  // URL for fetching an update manifest
-  GURL update_url_;
-
   // The manifest from which this extension was created.
   scoped_ptr<Manifest> manifest_;
 
   // Stored parsed manifest data.
   ManifestDataMap manifest_data_;
 
   // Set to true at the end of InitValue when initialization is finished.
   bool finished_parsing_manifest_;
 
   // A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
@@ skipping 116 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_