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

Side by Side Diff: build/common.gypi

Issue 10444060: Use chrome_html structure for shared_resources and options2 page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use chrome_html for all shared_resources and options page, specify background image sizes. Created 8 years, 6 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) 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 ['branding=="Chrome"', { 1039 ['branding=="Chrome"', {
1040 # TODO(mmoss) The .grd files look for _google_chrome, but for 1040 # TODO(mmoss) The .grd files look for _google_chrome, but for
1041 # consistency they should look for google_chrome_build like C++. 1041 # consistency they should look for google_chrome_build like C++.
1042 'grit_defines': ['-D', '_google_chrome', 1042 'grit_defines': ['-D', '_google_chrome',
1043 '-E', 'CHROMIUM_BUILD=google_chrome'], 1043 '-E', 'CHROMIUM_BUILD=google_chrome'],
1044 }, { 1044 }, {
1045 'grit_defines': ['-D', '_chromium', 1045 'grit_defines': ['-D', '_chromium',
1046 '-E', 'CHROMIUM_BUILD=chromium'], 1046 '-E', 'CHROMIUM_BUILD=chromium'],
1047 }], 1047 }],
1048 ['chromeos==1', { 1048 ['chromeos==1', {
1049 'grit_defines': ['-D', 'chromeos'], 1049 'grit_defines': ['-D', 'chromeos', '-D', 'scale_factors=2x'],
1050 }], 1050 }],
1051 ['toolkit_views==1', { 1051 ['toolkit_views==1', {
1052 'grit_defines': ['-D', 'toolkit_views'], 1052 'grit_defines': ['-D', 'toolkit_views'],
1053 }], 1053 }],
1054 ['use_aura==1', { 1054 ['use_aura==1', {
1055 'grit_defines': ['-D', 'use_aura'], 1055 'grit_defines': ['-D', 'use_aura'],
1056 }], 1056 }],
1057 ['use_ash==1', { 1057 ['use_ash==1', {
1058 'grit_defines': ['-D', 'use_ash'], 1058 'grit_defines': ['-D', 'use_ash'],
1059 }], 1059 }],
(...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after
3119 # settings in target dicts. SYMROOT is a special case, because many other 3119 # settings in target dicts. SYMROOT is a special case, because many other
3120 # Xcode variables depend on it, including variables such as 3120 # Xcode variables depend on it, including variables such as
3121 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3121 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3122 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3122 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3123 # files to appear (when present) in the UI as actual files and not red 3123 # files to appear (when present) in the UI as actual files and not red
3124 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3124 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3125 # and therefore SYMROOT, needs to be set at the project level. 3125 # and therefore SYMROOT, needs to be set at the project level.
3126 'SYMROOT': '<(DEPTH)/xcodebuild', 3126 'SYMROOT': '<(DEPTH)/xcodebuild',
3127 }, 3127 },
3128 } 3128 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/header_bar.css » ('j') | tools/gritsettings/resource_ids » ('J')

Powered by Google App Engine
This is Rietveld 408576698