| OLD | NEW |
| 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 # '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 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 'variables': { | 367 'variables': { |
| 368 'branding_dir': 'app/theme/google_chrome', | 368 'branding_dir': 'app/theme/google_chrome', |
| 369 'branding_dir_100': 'app/theme/default_100_percent/google_chrom
e', | 369 'branding_dir_100': 'app/theme/default_100_percent/google_chrom
e', |
| 370 }, | 370 }, |
| 371 }, { # else branding!="Chrome" | 371 }, { # else branding!="Chrome" |
| 372 'variables': { | 372 'variables': { |
| 373 'branding_dir': 'app/theme/chromium', | 373 'branding_dir': 'app/theme/chromium', |
| 374 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 374 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 375 }, | 375 }, |
| 376 }], | 376 }], |
| 377 ['use_aura==1 or target_arch=="x64"', { | 377 ['target_arch=="x64"', { |
| 378 'dependencies!': [ | 378 'dependencies!': [ |
| 379 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', | 379 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', |
| 380 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 380 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 381 ], | 381 ], |
| 382 'defines': [ | 382 'defines': [ |
| 383 'OMIT_CHROME_FRAME', | 383 'OMIT_CHROME_FRAME', |
| 384 ], | 384 ], |
| 385 }], | 385 }], |
| 386 ], | 386 ], |
| 387 }, | 387 }, |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1199 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1199 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1200 }, | 1200 }, |
| 1201 }, { # else branding!="Chrome" | 1201 }, { # else branding!="Chrome" |
| 1202 'variables': { | 1202 'variables': { |
| 1203 'branding_dir': 'app/theme/chromium', | 1203 'branding_dir': 'app/theme/chromium', |
| 1204 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1204 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1205 }, | 1205 }, |
| 1206 }], | 1206 }], |
| 1207 ], | 1207 ], |
| 1208 } | 1208 } |
| OLD | NEW |