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_npapi.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_npapi.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_npapi.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc index 0c58cff..f558fdd 100644 --- a/chrome_frame/chrome_frame_npapi.cc +++ b/chrome_frame/chrome_frame_npapi.cc @@ -409,7 +409,7 @@ bool ChromeFrameNPAPI::Initialize(NPMIMEType mime_type, NPP instance, // part of LaunchSettings /* if (!src_.empty()) - automation_client_->InitiateNavigation(src_); + automation_client_->InitiateNavigation(src_, is_privileged_); std::string proxy_settings; bool has_prefs = pref_service_->Initialize(instance_, @@ -1041,7 +1041,7 @@ void ChromeFrameNPAPI::OnAutomationServerReady() { } if (!src_.empty()) { - if (!automation_client_->InitiateNavigation(src_)) { + if (!automation_client_->InitiateNavigation(src_, is_privileged_)) { DLOG(ERROR) << "Failed to navigate to: " << src_; src_.clear(); } @@ -1309,7 +1309,7 @@ bool ChromeFrameNPAPI::NavigateToURL(const NPVariant* args, uint32_t arg_count, src_ = full_url; // Navigate only if we completed initialization i.e. proxy is set etc. if (ready_state_ == READYSTATE_COMPLETE) { - if (!automation_client_->InitiateNavigation(full_url)) { + if (!automation_client_->InitiateNavigation(full_url, is_privileged_)) { // TODO(tommi): call NPN_SetException. src_.clear(); return false; |