Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6539)

Unified Diff: chrome_frame/chrome_frame_npapi.cc

Issue 274071: When Chrome hands off a URL to be opened by the external host by the ViewHost... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_delegate.h ('k') | chrome_frame/test/chrome_frame_automation_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame_npapi.cc
===================================================================
--- chrome_frame/chrome_frame_npapi.cc (revision 29317)
+++ chrome_frame/chrome_frame_npapi.cc (working copy)
@@ -1041,7 +1041,9 @@
}
if (!src_.empty()) {
- if (!automation_client_->InitiateNavigation(src_, is_privileged_)) {
+ if (!automation_client_->InitiateNavigation(src_,
+ GetDocumentUrl(),
+ is_privileged_)) {
DLOG(ERROR) << "Failed to navigate to: " << src_;
src_.clear();
}
@@ -1309,7 +1311,9 @@
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, is_privileged_)) {
+ if (!automation_client_->InitiateNavigation(full_url,
+ GetDocumentUrl(),
+ is_privileged_)) {
// TODO(tommi): call NPN_SetException.
src_.clear();
return false;
« no previous file with comments | « chrome_frame/chrome_frame_delegate.h ('k') | chrome_frame/test/chrome_frame_automation_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698