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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment fix. Created 5 years, 10 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
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 '<(SHARED_INTERMEDIATE_DIR)/setup', 230 '<(SHARED_INTERMEDIATE_DIR)/setup',
231 ], 231 ],
232 'direct_dependent_settings': { 232 'direct_dependent_settings': {
233 'include_dirs': [ 233 'include_dirs': [
234 '<(SHARED_INTERMEDIATE_DIR)/setup', 234 '<(SHARED_INTERMEDIATE_DIR)/setup',
235 ], 235 ],
236 }, 236 },
237 'sources': [ 237 'sources': [
238 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc', 238 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc',
239 'installer/mini_installer/chrome.release', 239 'installer/mini_installer/chrome.release',
240 'installer/setup/app_launcher_installer.cc',
241 'installer/setup/app_launcher_installer.h',
240 'installer/setup/archive_patch_helper.cc', 242 'installer/setup/archive_patch_helper.cc',
241 'installer/setup/archive_patch_helper.h', 243 'installer/setup/archive_patch_helper.h',
242 'installer/setup/install.cc', 244 'installer/setup/install.cc',
243 'installer/setup/install.h', 245 'installer/setup/install.h',
244 'installer/setup/install_worker.cc', 246 'installer/setup/install_worker.cc',
245 'installer/setup/install_worker.h', 247 'installer/setup/install_worker.h',
246 'installer/setup/setup_main.cc', 248 'installer/setup/setup_main.cc',
247 'installer/setup/setup_main.h', 249 'installer/setup/setup_main.h',
248 'installer/setup/setup.ico', 250 'installer/setup/setup.ico',
249 'installer/setup/setup.rc', 251 'installer/setup/setup.rc',
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
1094 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1096 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1095 }, 1097 },
1096 }, { # else branding!="Chrome" 1098 }, { # else branding!="Chrome"
1097 'variables': { 1099 'variables': {
1098 'branding_dir': 'app/theme/chromium', 1100 'branding_dir': 'app/theme/chromium',
1099 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1101 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1100 }, 1102 },
1101 }], 1103 }],
1102 ], 1104 ],
1103 } 1105 }
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/chrome_installer_util.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698