summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container_win.cc
diff options
context:
space:
mode:
authortwiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 22:36:09 +0000
committertwiz@google.com <twiz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 22:36:09 +0000
commit8103c7fa6b614bf834b080962bdc28465ebe612b (patch)
tree0d0df40bff18ed832060bdd85969bf232f91117f /chrome/browser/external_tab_container_win.cc
parenta19124714ececf0de3c5b7b69b013fbbdec9a1b3 (diff)
downloadchromium_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/browser/external_tab_container_win.cc')
-rw-r--r--chrome/browser/external_tab_container_win.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index f645793..1af539b 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -383,6 +383,8 @@ void ExternalTabContainer::AddNewContents(TabContents* source,
attach_params_.dimensions = initial_pos;
attach_params_.user_gesture = user_gesture;
attach_params_.disposition = disposition;
+ attach_params_.profile_name = WideToUTF8(
+ tab_contents()->profile()->GetPath().DirName().BaseName().value());
automation_->Send(new AutomationMsg_AttachExternalTab(0,
tab_handle_, attach_params_));
} else {