diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 23:33:21 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 23:33:21 +0000 |
| commit | b30e0dd091e4ebf974b50e4e5efded72662e0be8 (patch) | |
| tree | 4fffe24fa8ecea272fa162de6b38c145c71e4c62 /chrome/common/extensions/extension.h | |
| parent | 8c6c7b074616bbb5aac505bb5305777ea92ed9ad (diff) | |
| download | chromium_src-b30e0dd091e4ebf974b50e4e5efded72662e0be8.zip chromium_src-b30e0dd091e4ebf974b50e4e5efded72662e0be8.tar.gz chromium_src-b30e0dd091e4ebf974b50e4e5efded72662e0be8.tar.bz2 | |
Replace the "origins" key in the manifest with "extent". The items in the extent are URLPatterns, like other parts of the extension system.
Review URL: http://codereview.chromium.org/552209
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension.h')
| -rw-r--r-- | chrome/common/extensions/extension.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 8175948..c0c5a53 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -24,7 +24,7 @@ // Represents a Chrome extension. class Extension { public: - typedef std::vector<URLPattern> HostPermissions; + typedef std::vector<URLPattern> URLPatternList; typedef std::map<const std::string, GURL> URLOverrideMap; // What an extension was loaded from. @@ -211,7 +211,7 @@ class Extension { const std::vector<std::string>& api_permissions() const { return api_permissions_; } - const HostPermissions& host_permissions() const { + const URLPatternList& host_permissions() const { return host_permissions_; } @@ -280,7 +280,7 @@ class Extension { void SetBackgroundPageReady(); // App stuff. - const std::vector<GURL>& app_origins() const { return app_origins_; } + const URLPatternList& app_extent() const { return app_extent_; } const GURL& app_launch_url() const { return app_launch_url_; } bool IsApp() const { return !app_launch_url_.is_empty(); } @@ -392,7 +392,7 @@ class Extension { std::vector<std::string> api_permissions_; // The sites this extension has permission to talk to (using XHR, etc). - HostPermissions host_permissions_; + URLPatternList host_permissions_; // The paths to the icons the extension contains mapped by their width. std::map<int, std::string> icons_; @@ -410,8 +410,8 @@ class Extension { // which override the handling of those URLs. URLOverrideMap chrome_url_overrides_; - // The vector of origin URLs associated with an app. - std::vector<GURL> app_origins_; + // Describes the space of URLs that are displayed in the app's custom frame. + URLPatternList app_extent_; // The URL an app should launch to. GURL app_launch_url_; |