diff options
| author | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 22:36:09 +0000 |
|---|---|---|
| committer | twiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 22:36:09 +0000 |
| commit | 8103c7fa6b614bf834b080962bdc28465ebe612b (patch) | |
| tree | 0d0df40bff18ed832060bdd85969bf232f91117f /chrome_frame/utils.cc | |
| parent | a19124714ececf0de3c5b7b69b013fbbdec9a1b3 (diff) | |
| download | chromium_src-8103c7fa6b614bf834b080962bdc28465ebe612b.zip chromium_src-8103c7fa6b614bf834b080962bdc28465ebe612b.tar.gz chromium_src-8103c7fa6b614bf834b080962bdc28465ebe612b.tar.bz2 | |
Change correcting the profile used when performing top-level navigations of the host browser with a ChromeFrame instance. If a ChromeFrame instance was loaded with a given profile, the bho used to always forward top-level navigation requests to a CF full-tab instance using the default (iexplore) profile. This caused problems with the automation channel, and the navigation would not complete.
I also cleaned up the gcf and host networking registry keys used by Chrome-Frame so that ActiveX instances will also respect their values.
TEST=None
BUG=None
Review URL: http://codereview.chromium.org/3295019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58884 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.cc')
| -rw-r--r-- | chrome_frame/utils.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 31cf389..26bab06 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -1355,6 +1355,13 @@ bool ChromeFrameUrl::ParseAttachExternalTabUrl() { } else { return false; } + + if (tokenizer.GetNext()) { + profile_name_ = tokenizer.token(); + } else { + return false; + } + return true; } @@ -1364,6 +1371,7 @@ void ChromeFrameUrl::Reset() { cookie_ = 0; dimensions_.SetRect(0, 0, 0, 0); disposition_ = 0; + profile_name_.clear(); } bool CanNavigate(const GURL& url, IInternetSecurityManager* security_manager, |