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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 7976045: Fix in-use updates for Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed line widths Created 9 years, 3 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
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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 '<(DEPTH)/testing/gtest.gyp:gtest', 335 '<(DEPTH)/testing/gtest.gyp:gtest',
336 ], 336 ],
337 'include_dirs': [ 337 'include_dirs': [
338 '<(DEPTH)', 338 '<(DEPTH)',
339 '<(INTERMEDIATE_DIR)', 339 '<(INTERMEDIATE_DIR)',
340 ], 340 ],
341 # TODO(robertshield): Move the items marked with "Move to lib" 341 # TODO(robertshield): Move the items marked with "Move to lib"
342 # below into a separate lib and then link both setup.exe and 342 # below into a separate lib and then link both setup.exe and
343 # setup_unittests.exe against that. 343 # setup_unittests.exe against that.
344 'sources': [ 344 'sources': [
345 'installer/util/installation_validation_helper.cc',
grt (UTC plus 2) 2011/09/22 19:28:35 i already have a pending change that moves these d
346 'installer/util/installation_validation_helper.h',
345 'installer/mini_installer/appid.h', 347 'installer/mini_installer/appid.h',
346 'installer/mini_installer/chrome_appid.cc', 348 'installer/mini_installer/chrome_appid.cc',
347 'installer/mini_installer/configuration.cc', 349 'installer/mini_installer/configuration.cc',
348 'installer/mini_installer/configuration.h', 350 'installer/mini_installer/configuration.h',
349 'installer/mini_installer/configuration_test.cc', 351 'installer/mini_installer/configuration_test.cc',
350 'installer/mini_installer/decompress.cc', 352 'installer/mini_installer/decompress.cc',
351 'installer/mini_installer/decompress.h', 353 'installer/mini_installer/decompress.h',
352 'installer/mini_installer/decompress_test.cc', 354 'installer/mini_installer/decompress_test.cc',
353 'installer/mini_installer/mini_string.cc', 355 'installer/mini_installer/mini_string.cc',
354 'installer/mini_installer/mini_string.h', 356 'installer/mini_installer/mini_string.h',
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 'variables': { 923 'variables': {
922 'branding_dir': 'app/theme/google_chrome', 924 'branding_dir': 'app/theme/google_chrome',
923 }, 925 },
924 }, { # else branding!="Chrome" 926 }, { # else branding!="Chrome"
925 'variables': { 927 'variables': {
926 'branding_dir': 'app/theme/chromium', 928 'branding_dir': 'app/theme/chromium',
927 }, 929 },
928 }], 930 }],
929 ], 931 ],
930 } 932 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/install.cc » ('j') | chrome/installer/setup/install_worker.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698