Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: chrome/chrome_installer.gypi

Issue 8176008: Merge 101684 - Added CopyRegKeyWorkItem in support of IE low rights policy fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_installer_util.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 '<(DEPTH)/testing/gtest.gyp:gtest', 69 '<(DEPTH)/testing/gtest.gyp:gtest',
70 ], 70 ],
71 'include_dirs': [ 71 'include_dirs': [
72 '<(DEPTH)', 72 '<(DEPTH)',
73 ], 73 ],
74 'sources': [ 74 'sources': [
75 'installer/setup/compat_checks_unittest.cc', 75 'installer/setup/compat_checks_unittest.cc',
76 'installer/setup/setup_constants.cc', 76 'installer/setup/setup_constants.cc',
77 'installer/util/browser_distribution_unittest.cc', 77 'installer/util/browser_distribution_unittest.cc',
78 'installer/util/channel_info_unittest.cc', 78 'installer/util/channel_info_unittest.cc',
79 'installer/util/copy_reg_key_work_item_unittest.cc',
79 'installer/util/copy_tree_work_item_unittest.cc', 80 'installer/util/copy_tree_work_item_unittest.cc',
80 'installer/util/create_dir_work_item_unittest.cc', 81 'installer/util/create_dir_work_item_unittest.cc',
81 'installer/util/create_reg_key_work_item_unittest.cc', 82 'installer/util/create_reg_key_work_item_unittest.cc',
82 'installer/util/delete_after_reboot_helper_unittest.cc', 83 'installer/util/delete_after_reboot_helper_unittest.cc',
83 'installer/util/delete_reg_key_work_item_unittest.cc', 84 'installer/util/delete_reg_key_work_item_unittest.cc',
84 'installer/util/delete_reg_value_work_item_unittest.cc', 85 'installer/util/delete_reg_value_work_item_unittest.cc',
85 'installer/util/delete_tree_work_item_unittest.cc', 86 'installer/util/delete_tree_work_item_unittest.cc',
86 'installer/util/duplicate_tree_detector_unittest.cc', 87 'installer/util/duplicate_tree_detector_unittest.cc',
87 'installer/util/fake_installation_state.h', 88 'installer/util/fake_installation_state.h',
88 'installer/util/fake_product_state.h', 89 'installer/util/fake_product_state.h',
89 'installer/util/google_chrome_distribution_unittest.cc', 90 'installer/util/google_chrome_distribution_unittest.cc',
90 'installer/util/google_update_settings_unittest.cc', 91 'installer/util/google_update_settings_unittest.cc',
91 'installer/util/install_util_unittest.cc', 92 'installer/util/install_util_unittest.cc',
92 'installer/util/installation_validator_unittest.cc', 93 'installer/util/installation_validator_unittest.cc',
93 'installer/util/installation_validation_helper.cc', 94 'installer/util/installation_validation_helper.cc',
94 'installer/util/installation_validation_helper.h', 95 'installer/util/installation_validation_helper.h',
95 'installer/util/installer_state_unittest.cc', 96 'installer/util/installer_state_unittest.cc',
96 'installer/util/installer_util_unittests.rc', 97 'installer/util/installer_util_unittests.rc',
97 'installer/util/installer_util_unittests_resource.h', 98 'installer/util/installer_util_unittests_resource.h',
98 'installer/util/language_selector_unittest.cc', 99 'installer/util/language_selector_unittest.cc',
99 'installer/util/lzma_util_unittest.cc', 100 'installer/util/lzma_util_unittest.cc',
100 'installer/util/master_preferences_unittest.cc', 101 'installer/util/master_preferences_unittest.cc',
101 'installer/util/move_tree_work_item_unittest.cc', 102 'installer/util/move_tree_work_item_unittest.cc',
102 'installer/util/product_unittest.h', 103 'installer/util/product_unittest.h',
103 'installer/util/product_unittest.cc', 104 'installer/util/product_unittest.cc',
104 'installer/util/product_state_unittest.cc', 105 'installer/util/product_state_unittest.cc',
106 'installer/util/registry_key_backup_unittest.cc',
107 'installer/util/registry_test_data.cc',
108 'installer/util/registry_test_data.h',
105 'installer/util/run_all_unittests.cc', 109 'installer/util/run_all_unittests.cc',
106 'installer/util/self_cleaning_temp_dir_unittest.cc', 110 'installer/util/self_cleaning_temp_dir_unittest.cc',
107 'installer/util/set_reg_value_work_item_unittest.cc', 111 'installer/util/set_reg_value_work_item_unittest.cc',
108 'installer/util/shell_util_unittest.cc', 112 'installer/util/shell_util_unittest.cc',
109 'installer/util/wmi_unittest.cc', 113 'installer/util/wmi_unittest.cc',
110 'installer/util/work_item_list_unittest.cc', 114 'installer/util/work_item_list_unittest.cc',
111 ], 115 ],
112 'msvs_settings': { 116 'msvs_settings': {
113 'VCManifestTool': { 117 'VCManifestTool': {
114 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_install er\\mini_installer.exe.manifest', 118 'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_install er\\mini_installer.exe.manifest',
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 'variables': { 919 'variables': {
916 'branding_dir': 'app/theme/google_chrome', 920 'branding_dir': 'app/theme/google_chrome',
917 }, 921 },
918 }, { # else branding!="Chrome" 922 }, { # else branding!="Chrome"
919 'variables': { 923 'variables': {
920 'branding_dir': 'app/theme/chromium', 924 'branding_dir': 'app/theme/chromium',
921 }, 925 },
922 }], 926 }],
923 ], 927 ],
924 } 928 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_installer_util.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698