diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 02:30:51 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 02:30:51 +0000 |
| commit | 5f7e9081951a820fd20e8a1c0fcfcec278391914 (patch) | |
| tree | 0a35cdb0079111d20b4a2acda00d68b9d3f965e2 | |
| parent | c68defa840deedffbd0320e8680060c42655d3eb (diff) | |
| download | chromium_src-5f7e9081951a820fd20e8a1c0fcfcec278391914.zip chromium_src-5f7e9081951a820fd20e8a1c0fcfcec278391914.tar.gz chromium_src-5f7e9081951a820fd20e8a1c0fcfcec278391914.tar.bz2 | |
Fixed assert on file manager open. Added chrome: override URL pattern to the list of extents.
BUG=chromium-os:30102
TEST=no assert when opening file manager with ctrl+m in debug builds
Review URL: http://codereview.chromium.org/10248003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134214 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/extensions/extension.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index f313c43..adbaa0a 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -62,6 +62,8 @@ namespace { const int kModernManifestVersion = 1; const int kPEMOutputColumns = 65; +const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*"; + // KEY MARKERS const char kKeyBeginHeaderMarker[] = "-----BEGIN"; const char kKeyBeginFooterMarker[] = "-----END"; @@ -2514,6 +2516,13 @@ bool Extension::LoadChromeURLOverrides(string16* error) { } // Replace the entry with a fully qualified chrome-extension:// URL. chrome_url_overrides_[page] = GetResourceURL(val); + // For component extensions, add override URL to extent patterns. + if (is_packaged_app() && location() == COMPONENT) { + URLPattern pattern(URLPattern::SCHEME_CHROMEUI); + pattern.Parse(base::StringPrintf(kOverrideExtentUrlPatternFormat, + page.c_str())); + extent_.AddPattern(pattern); + } } // An extension may override at most one page. |