From c4b63a9122fb9a181d8431bae3cc014db3647eda Mon Sep 17 00:00:00 2001 From: "grt@chromium.org" Date: Mon, 6 Jan 2014 18:00:31 +0000 Subject: [PATCH] Stop building Chrome Frame. BUG=316496 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/105473007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243119 0039d316-1c4b-4281-b951-d872f2087c98 --- .gitignore | 3 -- build/all.gyp | 44 ----------------- chrome/chrome_installer.gypi | 12 ----- chrome/installer/DEPS | 1 - .../installer/mini_installer/chrome.release | 4 -- chrome/installer/setup/install_worker.cc | 40 ++------------- chrome/tools/build/win/FILES.cfg | 49 ------------------- chrome/tools/check_grd_for_unused_strings.py | 1 - 8 files changed, 4 insertions(+), 150 deletions(-) diff --git a/.gitignore b/.gitignore index 85a17c94aa2f..f8c947b0d97e 100644 --- a/.gitignore +++ b/.gitignore @@ -118,9 +118,6 @@ v8.log /chrome/tools/memory /chrome/tools/test/reference_build /chrome/unit_tests_run.xml -/chrome_frame/chrome_frame_ie.xml -/chrome_frame/chrome_frame_launcher_version_resources.xml -/chrome_frame/chrome_frame_version_resources.xml /chrome_frame/tools/test/reference_build /cloud_print/cloud_print_version_resources.xml /components/variations.xml diff --git a/build/all.gyp b/build/all.gyp index 5eedff3239cb..721d04f3572f 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -153,8 +153,6 @@ 'dependencies': [ # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877 '../tools/memory_watcher/memory_watcher.gyp:*', - # TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875 - '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], ], @@ -279,7 +277,6 @@ # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../courgette/courgette.gyp:courgette_unittests', '../sandbox/sandbox.gyp:sbox_integration_tests', '../sandbox/sandbox.gyp:sbox_unittests', @@ -289,14 +286,6 @@ '../ui/views/views.gyp:views_unittests', ], 'conditions': [ - ['target_arch=="x64"', { - 'dependencies!': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - 'defines': [ - 'OMIT_CHROME_FRAME', - ], - }], # target_arch=="x64" # remoting_host_installation uses lots of non-trivial GYP that tend # to break because of differences between ninja and msbuild. Make # sure this target is built by the builders on the main waterfall. @@ -820,7 +809,6 @@ # mini_installer_tests depends on mini_installer. This should be # defined in installer.gyp. '../chrome/installer/mini_installer.gyp:mini_installer', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../courgette/courgette.gyp:courgette_unittests', '../device/device_tests.gyp:device_unittests', '../google_apis/gcm/gcm.gyp:gcm_unit_tests', @@ -844,27 +832,10 @@ '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin', ], - 'conditions': [ - ['target_arch=="x64"', { - 'dependencies!': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - 'defines': [ - 'OMIT_CHROME_FRAME', - ], - }], # target_arch=="x64" - ], }, { 'target_name': 'chromium_builder_win_cf', 'type': 'none', - 'conditions': [ - ['target_arch!="x64"', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - }], # target_arch!="x64" - ], }, { 'target_name': 'chromium_builder_dbg_tsan_win', @@ -949,7 +920,6 @@ ['target_arch=="ia32"', { 'dependencies': [ '../chrome/chrome.gyp:crash_service_win64', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', ], }], ['component != "shared_library" and wix_exists == "True" and \ @@ -958,11 +928,6 @@ '../remoting/remoting.gyp:remoting_host_installation', ], }], # component != "shared_library" - ['target_arch=="x64"', { - 'defines': [ - 'OMIT_CHROME_FRAME', - ], - }], # target_arch=="x64" ] }, ], # targets @@ -1004,15 +969,6 @@ ['OS=="win"', { 'dependencies': [ '../chrome/chrome.gyp:crash_service', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - }], - ['OS=="win" and target_arch=="x64"', { - 'dependencies!': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - 'defines': [ - 'OMIT_CHROME_FRAME', ], }], ['OS=="win" and target_arch=="ia32"', { diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 97468a9aeb17..95c80ae1a538 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -254,8 +254,6 @@ '../base/base.gyp:base', '../breakpad/breakpad.gyp:breakpad_handler', '../chrome/common_constants.gyp:common_constants', - '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', '../rlz/rlz.gyp:rlz_lib', '../third_party/zlib/zlib.gyp:zlib', ], @@ -381,15 +379,6 @@ 'branding_dir_100': 'app/theme/default_100_percent/chromium', }, }], - ['target_arch=="x64"', { - 'dependencies!': [ - '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - 'defines': [ - 'OMIT_CHROME_FRAME', - ], - }], ], }, { @@ -402,7 +391,6 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', - '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], diff --git a/chrome/installer/DEPS b/chrome/installer/DEPS index 15a202f4c4f6..5a293102f9a7 100644 --- a/chrome/installer/DEPS +++ b/chrome/installer/DEPS @@ -1,6 +1,5 @@ include_rules = [ "+breakpad", - "+chrome_frame", "+google_update", "+rlz", "+third_party/bspatch", diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 94050afce31e..c12e7b538266 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -22,9 +22,6 @@ chrome.dll: %(VersionDir)s\ chrome_100_percent.pak: %(VersionDir)s\ chrome_child.dll: %(VersionDir)s\ chrome_elf.dll: %(VersionDir)s\ -chrome_frame_helper.dll: %(VersionDir)s\ -chrome_frame_helper.exe: %(VersionDir)s\ -chrome_launcher.exe: %(VersionDir)s\ D3DCompiler_43.dll: %(VersionDir)s\ d3dcompiler_46.dll: %(VersionDir)s\ ffmpegsumo.dll: %(VersionDir)s\ @@ -34,7 +31,6 @@ libGLESv2.dll: %(VersionDir)s\ nacl64.exe: %(VersionDir)s\ nacl_irt_x86_32.nexe: %(VersionDir)s\ nacl_irt_x86_64.nexe: %(VersionDir)s\ -npchrome_frame.dll: %(VersionDir)s\ pdf.dll: %(VersionDir)s\ ppGoogleNaClPluginChrome.dll: %(VersionDir)s\ resources.pak: %(VersionDir)s\ diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 16aebce0bb41..1713fe5884a2 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -48,10 +48,6 @@ #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::ASCIIToWide; using base::win::RegKey; @@ -59,11 +55,6 @@ namespace installer { namespace { -enum ElevationPolicyId { - CURRENT_ELEVATION_POLICY, - OLD_ELEVATION_POLICY, -}; - // The version identifying the work done by setup.exe --configure-user-settings // on user login by way of Active Setup. Increase this value if the work done // in setup_main.cc's handling of kConfigureUserSettings changes and should be @@ -77,37 +68,14 @@ 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, - base::string16* key_path) { - DCHECK(policy == CURRENT_ELEVATION_POLICY || policy == OLD_ELEVATION_POLICY); +void GetOldIELowRightsElevationPolicyKeyPath(base::string16* key_path) { 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); - } + key_path->append(kIELowRightsPolicyOldGuid, + arraysize(kIELowRightsPolicyOldGuid)- 1); } // Local helper to call AddRegisterComDllWorkItems for all DLLs in a set of @@ -1374,7 +1342,7 @@ void AddDeleteOldIELowRightsPolicyWorkItems( DCHECK(install_list); base::string16 key_path; - GetIELowRightsElevationPolicyKeyPath(OLD_ELEVATION_POLICY, &key_path); + GetOldIELowRightsElevationPolicyKeyPath(&key_path); install_list->AddDeleteRegKeyWorkItem(installer_state.root_key(), key_path); } diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 0cc1b57af9bf..d829eb6fafdb 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -571,31 +571,6 @@ FILES = [ 'buildtype': ['dev', 'official'], 'optional': ['dev', 'official'], }, - # Chrome Frame: - { - 'filename': 'npchrome_frame.dll', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'filegroup': ['default', 'symsrc'], - }, - { - 'filename': 'chrome_launcher.exe', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'filegroup': ['default', 'symsrc'], - }, - { - 'filename': 'chrome_frame_helper.exe', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'filegroup': ['default', 'symsrc'], - }, - { - 'filename': 'chrome_frame_helper.dll', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'filegroup': ['default', 'symsrc'], - }, # Test binaries for external QA: { 'filename': 'interactive_ui_tests.exe', @@ -714,30 +689,6 @@ FILES = [ 'buildtype': ['dev', 'official'], 'archive': 'chrome-win32-syms.zip', }, - { - 'filename': 'npchrome_frame.dll.pdb', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'archive': 'chrome-win32-syms.zip', - }, - { - 'filename': 'chrome_launcher.exe.pdb', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'archive': 'chrome-win32-syms.zip', - }, - { - 'filename': 'chrome_frame_helper.exe.pdb', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'archive': 'chrome-win32-syms.zip', - }, - { - 'filename': 'chrome_frame_helper.dll.pdb', - 'arch': ['32bit'], - 'buildtype': ['dev', 'official'], - 'archive': 'chrome-win32-syms.zip', - }, { 'filename': 'syzygy/chrome.dll.pdb', 'arch': ['32bit'], diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py index 6d7768cb2b39..3334e3af4106 100755 --- a/chrome/tools/check_grd_for_unused_strings.py +++ b/chrome/tools/check_grd_for_unused_strings.py @@ -163,7 +163,6 @@ def main(): os.path.join(src_dir, 'app'), os.path.join(src_dir, 'ash'), os.path.join(src_dir, 'chrome'), - os.path.join(src_dir, 'chrome_frame'), os.path.join(src_dir, 'components'), os.path.join(src_dir, 'content'), os.path.join(src_dir, 'device'),