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

Side by Side Diff: build/common.gypi

Issue 10829281: Make ChromeOS imply enable_hidpi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/chrome_resources.gyp » ('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 # 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 'toolkit_views%': 0, 118 'toolkit_views%': 0,
119 }], 119 }],
120 120
121 # Set toolkit_uses_gtk for the Chromium browser on Linux. 121 # Set toolkit_uses_gtk for the Chromium browser on Linux.
122 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', { 122 ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
123 'toolkit_uses_gtk%': 1, 123 'toolkit_uses_gtk%': 1,
124 }, { 124 }, {
125 'toolkit_uses_gtk%': 0, 125 'toolkit_uses_gtk%': 0,
126 }], 126 }],
127 127
128 # Enable HiDPI on Mac OS. 128 # Enable HiDPI on Mac OS and Chrome OS.
129 ['OS=="mac"', { 129 ['OS=="mac" or chromeos==1', {
130 'enable_hidpi%': 1, 130 'enable_hidpi%': 1,
131 }], 131 }],
132 132
133 # Enable touch UI on Metro and Chrome OS. 133 # Enable touch UI on Metro and Chrome OS.
134 ['OS=="win" or chromeos==1', { 134 ['OS=="win" or chromeos==1', {
135 'enable_touch_ui%': 1, 135 'enable_touch_ui%': 1,
136 }], 136 }],
137 ], 137 ],
138 }, 138 },
139 139
(...skipping 3242 matching lines...) Expand 10 before | Expand all | Expand 10 after
3382 # settings in target dicts. SYMROOT is a special case, because many other 3382 # settings in target dicts. SYMROOT is a special case, because many other
3383 # Xcode variables depend on it, including variables such as 3383 # Xcode variables depend on it, including variables such as
3384 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3384 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3385 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3385 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3386 # files to appear (when present) in the UI as actual files and not red 3386 # files to appear (when present) in the UI as actual files and not red
3387 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3387 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3388 # and therefore SYMROOT, needs to be set at the project level. 3388 # and therefore SYMROOT, needs to be set at the project level.
3389 'SYMROOT': '<(DEPTH)/xcodebuild', 3389 'SYMROOT': '<(DEPTH)/xcodebuild',
3390 }, 3390 },
3391 } 3391 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698