summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/chrome_frame_test_utils.cc
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/test/chrome_frame_test_utils.cc
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/test/chrome_frame_test_utils.cc')
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index beeba70..85ecc5b 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -21,7 +21,6 @@
#include "base/win/registry.h"
#include "base/win/scoped_handle.h"
#include "base/win/windows_version.h"
-#include "ceee/ie/common/ceee_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_paths_internal.h"
@@ -438,14 +437,13 @@ IEVersion GetInstalledIEVersion() {
return IE_UNSUPPORTED;
}
-// TODO(joi@chromium.org) Could share this code with chrome_frame_plugin.h
FilePath GetProfilePathForIE() {
FilePath profile_path;
// Browsers without IDeleteBrowsingHistory in non-priv mode
// have their profiles moved into "Temporary Internet Files".
// The code below basically retrieves the version of IE and computes
// the profile directory accordingly.
- if (GetInstalledIEVersion() <= IE_7 && !ceee_util::IsIeCeeeRegistered()) {
+ if (GetInstalledIEVersion() <= IE_7) {
profile_path = GetIETemporaryFilesFolder();
profile_path = profile_path.Append(L"Google Chrome Frame");
} else {