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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 103253004: Remove Chrome Frame quick-enable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment fix Created 7 years 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/installer/setup/chrome_frame_quick_enable.h » ('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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 'include_dirs': [ 268 'include_dirs': [
269 '<(SHARED_INTERMEDIATE_DIR)/setup', 269 '<(SHARED_INTERMEDIATE_DIR)/setup',
270 ], 270 ],
271 }, 271 },
272 'sources': [ 272 'sources': [
273 'installer/mini_installer/chrome.release', 273 'installer/mini_installer/chrome.release',
274 'installer/setup/archive_patch_helper.cc', 274 'installer/setup/archive_patch_helper.cc',
275 'installer/setup/archive_patch_helper.h', 275 'installer/setup/archive_patch_helper.h',
276 'installer/setup/cf_migration.cc', 276 'installer/setup/cf_migration.cc',
277 'installer/setup/cf_migration.h', 277 'installer/setup/cf_migration.h',
278 'installer/setup/chrome_frame_quick_enable.cc',
279 'installer/setup/chrome_frame_quick_enable.h',
280 'installer/setup/install.cc', 278 'installer/setup/install.cc',
281 'installer/setup/install.h', 279 'installer/setup/install.h',
282 'installer/setup/install_worker.cc', 280 'installer/setup/install_worker.cc',
283 'installer/setup/install_worker.h', 281 'installer/setup/install_worker.h',
284 'installer/setup/setup_main.cc', 282 'installer/setup/setup_main.cc',
285 'installer/setup/setup_main.h', 283 'installer/setup/setup_main.h',
286 'installer/setup/setup.ico', 284 'installer/setup/setup.ico',
287 'installer/setup/setup.rc', 285 'installer/setup/setup.rc',
288 'installer/setup/setup_constants.cc', 286 'installer/setup/setup_constants.cc',
289 'installer/setup/setup_constants.h', 287 'installer/setup/setup_constants.h',
(...skipping 932 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1220 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1223 }, 1221 },
1224 }, { # else branding!="Chrome" 1222 }, { # else branding!="Chrome"
1225 'variables': { 1223 'variables': {
1226 'branding_dir': 'app/theme/chromium', 1224 'branding_dir': 'app/theme/chromium',
1227 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1225 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1228 }, 1226 },
1229 }], 1227 }],
1230 ], 1228 ],
1231 } 1229 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/chrome_frame_quick_enable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698