diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 16:00:21 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 16:00:21 +0000 |
| commit | 10bf1a7030eeed02e2af95eaff012d2428ea5bc2 (patch) | |
| tree | f381f0333bb9901aca6d2d5e2b0fdbfc5743b6d2 /chrome_frame/utils.cc | |
| parent | 7f14e1fd31ddd510b19e2d9f6942c45435c9a8c6 (diff) | |
| download | chromium_src-10bf1a7030eeed02e2af95eaff012d2428ea5bc2.zip chromium_src-10bf1a7030eeed02e2af95eaff012d2428ea5bc2.tar.gz chromium_src-10bf1a7030eeed02e2af95eaff012d2428ea5bc2.tar.bz2 | |
Committing patch 256001 for Roger:http://codereview.chromium.org/256001Allow Chrome Frame to display chrome-extension URLs when running in privilegedmode.BUG=noneTEST=see unit tests
Review URL: http://codereview.chromium.org/246050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.cc')
| -rw-r--r-- | chrome_frame/utils.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index b445c26..36e8afd 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -601,7 +601,7 @@ HRESULT GetUrlFromMoniker(IMoniker* moniker, IBindCtx* bind_context, return hr; } -bool IsValidUrlScheme(const std::wstring& url) { +bool IsValidUrlScheme(const std::wstring& url, bool is_privileged) { if (url.empty()) return false; @@ -611,6 +611,9 @@ bool IsValidUrlScheme(const std::wstring& url) { crack_url.SchemeIs("about") || crack_url.SchemeIs("view-source")) return true; + if (is_privileged && crack_url.SchemeIs("chrome-extension")) + return true; + if (StartsWith(url, kChromeAttachExternalTabPrefix, false)) return true; |