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/chrome_frame_automation.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/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 1f369b5..a03a39c 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -477,15 +477,17 @@ void ChromeFrameAutomationClient::Uninitialize() { init_state_ = UNINITIALIZED; } -bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url) { +bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url, + bool is_privileged) { if (url.empty()) return false; url_ = GURL(url); // Catch invalid URLs early. - if (!url_.is_valid() || !IsValidUrlScheme(UTF8ToWide(url))) { - DLOG(ERROR) << "Invalid URL passed to InitiateNavigation: " << url; + if (!url_.is_valid() || !IsValidUrlScheme(UTF8ToWide(url), is_privileged)) { + DLOG(ERROR) << "Invalid URL passed to InitiateNavigation: " << url + << " is_privileged=" << is_privileged; return false; } |