summaryrefslogtreecommitdiffstats
path: root/chrome_frame/utils.h
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_frame/utils.h
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_frame/utils.h')
-rw-r--r--chrome_frame/utils.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 0587fdd..e0da6ac 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -517,6 +517,10 @@ class ChromeFrameUrl {
return parsed_url_;
}
+ const std::string& profile_name() const {
+ return profile_name_;
+ }
+
private:
// If we are attaching to an existing external tab, this function parses the
// suffix portion of the URL which contains the attach_external_tab prefix.
@@ -532,6 +536,7 @@ class ChromeFrameUrl {
int disposition_;
GURL parsed_url_;
+ std::string profile_name_;
};
// Returns true if we can navigate to this URL.