summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_activex_base.h
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-31 21:44:26 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-31 21:44:26 +0000
commitd9ca776c4b5443df5ffa55d53735016cfa92cb11 (patch)
treeb38dc25a420ce51472fd8d0052d18b1e048d2970 /chrome_frame/chrome_frame_activex_base.h
parent9f9db89fe9a1b4e82ab3cfa25b579f8b46fe389e (diff)
downloadchromium_src-d9ca776c4b5443df5ffa55d53735016cfa92cb11.zip
chromium_src-d9ca776c4b5443df5ffa55d53735016cfa92cb11.tar.gz
chromium_src-d9ca776c4b5443df5ffa55d53735016cfa92cb11.tar.bz2
Disabling building of CEEE; we will be moving the code to a separate
repository. Removing chrome_frame -> ceee dependency. BUG=none TEST=none Review URL: http://codereview.chromium.org/6386025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex_base.h')
-rw-r--r--chrome_frame/chrome_frame_activex_base.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index 510de4c..8ef28b5 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -24,7 +24,6 @@
#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"
@@ -398,12 +397,7 @@ 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 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()) {
+ if (is_IE && GetIEVersion() < IE_8) {
*profile_path = GetIETemporaryFilesFolder();
*profile_path = profile_path->Append(L"Google Chrome Frame");
} else {