diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 19:58:30 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 19:58:30 +0000 |
| commit | 38f57abb36fa6c91d9939a2393f9998dd40c51ba (patch) | |
| tree | 061d6b93b361cd12589bb8fb294e831b6a66382b /chrome_frame/chrome_frame_activex_base.h | |
| parent | cb4da7b7cca16b19401ae9475383c70ac310337e (diff) | |
| download | chromium_src-38f57abb36fa6c91d9939a2393f9998dd40c51ba.zip chromium_src-38f57abb36fa6c91d9939a2393f9998dd40c51ba.tar.gz chromium_src-38f57abb36fa6c91d9939a2393f9998dd40c51ba.tar.bz2 | |
Always use persistent profile for CF+CEEE installs.
BUG=64840
TEST=With --enable-ceee, CF profiles on IE7 should not be under Temporary Internet Files.
Review URL: http://codereview.chromium.org/5254012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index ebaf06c..1dd2755 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -24,6 +24,7 @@ #include "base/win/scoped_comptr.h" #include "base/win/scoped_variant.h" #include "grit/chrome_frame_resources.h" +#include "ceee/ie/common/ceee_util.h" #include "chrome/common/url_constants.h" #include "chrome_frame/chrome_frame_plugin.h" #include "chrome_frame/com_message_event.h" @@ -411,7 +412,12 @@ END_MSG_MAP() (lstrcmpi(profile_name.c_str(), kRundllProfileName) == 0); // Browsers without IDeleteBrowsingHistory in non-priv mode // have their profiles moved into "Temporary Internet Files". - if (is_IE && GetIEVersion() < IE_8 && !is_privileged_) { + // + // If CEEE is registered, we must have a persistent profile. We + // considered checking if e.g. ceee_ie.dll is loaded in the process + // but this gets into edge cases when the user enables the CEEE add-on + // after CF is first loaded. + if (is_IE && GetIEVersion() < IE_8 && !ceee_util::IsIeCeeeRegistered()) { *profile_path = GetIETemporaryFilesFolder(); *profile_path = profile_path->Append(L"Google Chrome Frame"); } else { |