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

Side by Side Diff: build/common.gypi

Issue 11784034: Skeleton for app_list on OSX, and refactoring for enable_app_list=1 on OS=="mac". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adds cocoa unittest, controller browser test; address reviewer comments Created 7 years, 11 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
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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 # Enable HiDPI on Mac OS and Chrome OS. 128 # Enable HiDPI on Mac OS and Chrome OS.
129 ['OS=="mac" or chromeos==1', { 129 ['OS=="mac" or chromeos==1', {
130 'enable_hidpi%': 1, 130 'enable_hidpi%': 1,
131 }], 131 }],
132 132
133 # Enable touch UI on Metro. 133 # Enable touch UI on Metro.
134 ['OS=="win"', { 134 ['OS=="win"', {
135 'enable_touch_ui%': 1, 135 'enable_touch_ui%': 1,
136 }], 136 }],
137 137
138 # Enable App Launcher only on ChromeOS and Windows for now. 138 # Enable App Launcher only on ChromeOS, Windows and OSX.
139 ['use_ash==1 or OS=="win"', { 139 ['use_ash==1 or OS=="win" or OS=="mac"', {
140 'enable_app_list%': 1, 140 'enable_app_list%': 1,
141 }, { 141 }, {
142 'enable_app_list%': 0, 142 'enable_app_list%': 0,
143 }], 143 }],
144 144
145 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { 145 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', {
146 'use_default_render_theme%': 1, 146 'use_default_render_theme%': 1,
147 }, { 147 }, {
148 'use_default_render_theme%': 0, 148 'use_default_render_theme%': 0,
149 }], 149 }],
(...skipping 3796 matching lines...) Expand 10 before | Expand all | Expand 10 after
3946 # settings in target dicts. SYMROOT is a special case, because many other 3946 # settings in target dicts. SYMROOT is a special case, because many other
3947 # Xcode variables depend on it, including variables such as 3947 # Xcode variables depend on it, including variables such as
3948 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3948 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3949 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3949 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3950 # files to appear (when present) in the UI as actual files and not red 3950 # files to appear (when present) in the UI as actual files and not red
3951 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3951 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3952 # and therefore SYMROOT, needs to be set at the project level. 3952 # and therefore SYMROOT, needs to be set at the project level.
3953 'SYMROOT': '<(DEPTH)/xcodebuild', 3953 'SYMROOT': '<(DEPTH)/xcodebuild',
3954 }, 3954 },
3955 } 3955 }
OLDNEW
« no previous file with comments | « ash/wm/app_list_controller.cc ('k') | chrome/browser/ui/app_list/app_list_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698