| Index: chrome/chrome_installer.gypi
|
| diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
|
| index 39c94fd62fe1a270d918c8587c53a07258422620..a29ef3085721e7295d235f4f00eb42ada08c2c6f 100644
|
| --- a/chrome/chrome_installer.gypi
|
| +++ b/chrome/chrome_installer.gypi
|
| @@ -379,10 +379,12 @@
|
| [ 'branding == "Chrome"', {
|
| 'variables': {
|
| 'branding_dir': 'app/theme/google_chrome',
|
| + 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
|
| },
|
| }, { # else branding!="Chrome"
|
| 'variables': {
|
| 'branding_dir': 'app/theme/chromium',
|
| + 'branding_dir_100': 'app/theme/default_100_percent/chromium',
|
| },
|
| }],
|
| ],
|
| @@ -469,6 +471,7 @@
|
| 'variables': {
|
| # Always google_chrome since this only applies to branding==Chrome.
|
| 'branding_dir': 'app/theme/google_chrome',
|
| + 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
|
| 'version' : '<!(python <(version_py_path) -f ../chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")',
|
| 'revision' : '<!(python ../build/util/lastchange.py --revision-only)',
|
| 'packaging_files_common': [
|
| @@ -581,10 +584,10 @@
|
| {
|
| 'destination': '<(PRODUCT_DIR)/installer/theme/',
|
| 'files': [
|
| - 'default_100_percent/<(branding_dir)/product_logo_16.png',
|
| + '<(branding_dir_100)/product_logo_16.png',
|
| '<(branding_dir)/product_logo_22.png',
|
| '<(branding_dir)/product_logo_24.png',
|
| - 'default_100_percent/<(branding_dir)/product_logo_32.png',
|
| + '<(branding_dir_100)/product_logo_32.png',
|
| '<(branding_dir)/product_logo_48.png',
|
| '<(branding_dir)/product_logo_64.png',
|
| '<(branding_dir)/product_logo_128.png',
|
| @@ -1086,10 +1089,12 @@
|
| [ 'branding == "Chrome"', {
|
| 'variables': {
|
| 'branding_dir': 'app/theme/google_chrome',
|
| + 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
|
| },
|
| }, { # else branding!="Chrome"
|
| 'variables': {
|
| 'branding_dir': 'app/theme/chromium',
|
| + 'branding_dir_100': 'app/theme/default_100_percent/chromium',
|
| },
|
| }],
|
| ],
|
|
|