summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 08:17:15 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-30 08:17:15 +0000
commit6f8f31d39209eba83937656925d874e4e3086998 (patch)
tree293317eeea00abdc989536d5177d81534682dedd /chrome_frame
parent0ce6e3988acb7c04f3218d6a751be5c9cc39d501 (diff)
downloadchromium_src-6f8f31d39209eba83937656925d874e4e3086998.zip
chromium_src-6f8f31d39209eba83937656925d874e4e3086998.tar.gz
chromium_src-6f8f31d39209eba83937656925d874e4e3086998.tar.bz2
Reinstating the call to InitiateNavigation when we launch the url from our active document. This is needed to pass
the referrer correctly to chrome. TBR=amit Review URL: http://codereview.chromium.org/3080012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_active_document.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc
index 5a649cc..132d529 100644
--- a/chrome_frame/chrome_active_document.cc
+++ b/chrome_frame/chrome_active_document.cc
@@ -972,6 +972,13 @@ bool ChromeActiveDocument::LaunchUrl(const ChromeFrameUrl& cf_url,
if (cf_url.attach_to_external_tab()) {
dimensions_ = cf_url.dimensions();
automation_client_->AttachExternalTab(cf_url.cookie());
+ } else if (!automation_client_->InitiateNavigation(utf8_url,
+ referrer,
+ is_privileged_)) {
+ DLOG(ERROR) << "Invalid URL: " << url_;
+ Error(L"Invalid URL");
+ url_.Reset();
+ return false;
}
if (is_automation_client_reused_)