Index: chrome/installer/setup/install_worker.cc |
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc |
index 5450e32947b91e6495cd6d54f93d1a996e69c3ea..34cd9e1781e2021d7d95c40efa137bf98cc29776 100644 |
--- a/chrome/installer/setup/install_worker.cc |
+++ b/chrome/installer/setup/install_worker.cc |
@@ -47,10 +47,7 @@ |
#include "chrome/installer/util/shell_util.h" |
#include "chrome/installer/util/util_constants.h" |
#include "chrome/installer/util/work_item_list.h" |
- |
-#if !defined(OMIT_CHROME_FRAME) |
#include "chrome_frame/chrome_tab.h" |
-#endif |
using base::win::RegKey; |
@@ -76,33 +73,20 @@ const wchar_t kActiveSetupVersion[] = L"24,0,0,0"; |
const wchar_t kIELowRightsPolicyOldGuid[] = |
L"{6C288DD7-76FB-4721-B628-56FAC252E199}"; |
-#if defined(OMIT_CHROME_FRAME) |
-// For historical reasons, this GUID is the same as CLSID_ChromeFrame. Included |
-// here to break the dependency on Chrome Frame when Chrome Frame is not being |
-// built. |
-// TODO(robertshield): Remove this when Chrome Frame works with Aura. |
-const wchar_t kIELowRightsPolicyCurrentGuid[] = |
- L"{E0A900DF-9611-4446-86BD-4B1D47E7DB2A}"; |
-#endif |
- |
const wchar_t kElevationPolicyKeyPath[] = |
L"SOFTWARE\\Microsoft\\Internet Explorer\\Low Rights\\ElevationPolicy\\"; |
void GetIELowRightsElevationPolicyKeyPath(ElevationPolicyId policy, |
string16* key_path) { |
DCHECK(policy == CURRENT_ELEVATION_POLICY || policy == OLD_ELEVATION_POLICY); |
+ |
key_path->assign(kElevationPolicyKeyPath, |
arraysize(kElevationPolicyKeyPath) - 1); |
if (policy == CURRENT_ELEVATION_POLICY) { |
-#if defined(OMIT_CHROME_FRAME) |
- key_path->append(kIELowRightsPolicyCurrentGuid, |
- arraysize(kIELowRightsPolicyCurrentGuid) - 1); |
-#else |
wchar_t cf_clsid[64]; |
int len = StringFromGUID2(__uuidof(ChromeFrame), &cf_clsid[0], |
arraysize(cf_clsid)); |
key_path->append(&cf_clsid[0], len - 1); |
-#endif |
} else { |
key_path->append(kIELowRightsPolicyOldGuid, |
arraysize(kIELowRightsPolicyOldGuid)- 1); |