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/test/automation | |
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/test/automation')
-rw-r--r-- | chrome/test/automation/automation_messages.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h index f4f7032..714c527 100644 --- a/chrome/test/automation/automation_messages.h +++ b/chrome/test/automation/automation_messages.h @@ -580,6 +580,7 @@ struct AttachExternalTabParams { gfx::Rect dimensions; int disposition; bool user_gesture; + std::string profile_name; }; template <> @@ -591,6 +592,7 @@ struct ParamTraits<AttachExternalTabParams> { WriteParam(m, p.dimensions); WriteParam(m, p.disposition); WriteParam(m, p.user_gesture); + WriteParam(m, p.profile_name); } static bool Read(const Message* m, void** iter, param_type* p) { @@ -598,7 +600,8 @@ struct ParamTraits<AttachExternalTabParams> { ReadParam(m, iter, &p->url) && ReadParam(m, iter, &p->dimensions) && ReadParam(m, iter, &p->disposition) && - ReadParam(m, iter, &p->user_gesture); + ReadParam(m, iter, &p->user_gesture) && + ReadParam(m, iter, &p->profile_name); } static void Log(const param_type& p, std::string* l) { @@ -612,6 +615,8 @@ struct ParamTraits<AttachExternalTabParams> { LogParam(p.disposition, l); l->append(", "); LogParam(p.user_gesture, l); + l->append(","); + LogParam(p.profile_name, l); l->append(")"); } }; |