| Index: chrome/common/extensions/extension.h
|
| diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
|
| index 29b503cf2203b60a7217717c5a0860e46482b5f5..57a1b7a70f069a8c0943602396a985ec69318faf 100644
|
| --- a/chrome/common/extensions/extension.h
|
| +++ b/chrome/common/extensions/extension.h
|
| @@ -355,9 +355,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // the browser might load (like themes and page action icons).
|
| std::set<base::FilePath> GetBrowserImages() const;
|
|
|
| - // Gets the fully resolved absolute launch URL.
|
| - GURL GetFullLaunchURL() const;
|
| -
|
| // Returns true if this extension can execute script on a page. If a
|
| // UserScript object is passed, permission to run that specific script is
|
| // checked (using its matches list). Otherwise, permission to execute script
|
| @@ -505,15 +502,12 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| bool is_extension() const;
|
| bool is_storage_isolated() const { return is_storage_isolated_; }
|
| bool can_be_incognito_enabled() const;
|
| +
|
| + // TODO(mhx348@motorola.com): Move the below extent related functions to its
|
| + // ManifestData.
|
| void AddWebExtentPattern(const URLPattern& pattern);
|
| + void ClearWebExtentPatterns();
|
| const URLPatternSet& web_extent() const { return extent_; }
|
| - const std::string& launch_local_path() const { return launch_local_path_; }
|
| - const std::string& launch_web_url() const { return launch_web_url_; }
|
| - extension_misc::LaunchContainer launch_container() const {
|
| - return launch_container_;
|
| - }
|
| - int launch_width() const { return launch_width_; }
|
| - int launch_height() const { return launch_height_; }
|
|
|
| // Theme-related.
|
| bool is_theme() const;
|
| @@ -593,8 +587,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| const char* list_error,
|
| const char* value_error,
|
| string16* error);
|
| - bool LoadLaunchContainer(string16* error);
|
| - bool LoadLaunchURL(string16* error);
|
|
|
| bool LoadSharedFeatures(string16* error);
|
| bool LoadDescription(string16* error);
|
| @@ -639,10 +631,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // an extension that has a browser action and a page action.
|
| bool HasMultipleUISurfaces() const;
|
|
|
| - // Updates the launch URL and extents for the extension using the given
|
| - // |override_url|.
|
| - void OverrideLaunchUrl(const GURL& override_url);
|
| -
|
| // Custom checks for the experimental permission that can't be expressed in
|
| // _permission_features.json.
|
| bool CanSpecifyExperimentalPermission() const;
|
| @@ -768,25 +756,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
|
| // Whether this extension requests isolated storage.
|
| bool is_storage_isolated_;
|
|
|
| - // The local path inside the extension to use with the launcher.
|
| - std::string launch_local_path_;
|
| -
|
| - // A web url to use with the launcher. Note that this might be relative or
|
| - // absolute. If relative, it is relative to web_origin.
|
| - std::string launch_web_url_;
|
| -
|
| - // The window type that an app's manifest specifies to launch into.
|
| - // This is not always the window type an app will open into, because
|
| - // users can override the way each app launches. See
|
| - // ExtensionPrefs::GetLaunchContainer(), which looks at a per-app pref
|
| - // to decide what container an app will launch in.
|
| - extension_misc::LaunchContainer launch_container_;
|
| -
|
| - // The default size of the container when launching. Only respected for
|
| - // containers like panels and windows.
|
| - int launch_width_;
|
| - int launch_height_;
|
| -
|
| // Should this app be shown in the app launcher.
|
| bool display_in_launcher_;
|
|
|
|
|