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

Side by Side Diff: build/features_override.gypi

Issue 7033018: Handler settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove in_unit_test_ Created 9 years, 7 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 | « build/common.gypi ('k') | chrome/app/generated_resources.grd » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # This file is only included in full-chromium builds, and overrides the 5 # This file is only included in full-chromium builds, and overrides the
6 # feature_defines variable in 6 # feature_defines variable in
7 # third_party/WebKit/Source/WebKit/chromium/features.gypi. 7 # third_party/WebKit/Source/WebKit/chromium/features.gypi.
8 { 8 {
9 'variables': { 9 'variables': {
10 # WARNING: This list of strings completely replaces the list in 10 # WARNING: This list of strings completely replaces the list in
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 'feature_defines': [ 113 'feature_defines': [
114 'ENABLE_WEB_AUDIO=1', 114 'ENABLE_WEB_AUDIO=1',
115 ], 115 ],
116 }], 116 }],
117 # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg. 117 # Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg.
118 ['OS!="mac"', { 118 ['OS!="mac"', {
119 'feature_defines': [ 119 'feature_defines': [
120 'WTF_USE_WEBAUDIO_FFMPEG=1', 120 'WTF_USE_WEBAUDIO_FFMPEG=1',
121 ], 121 ],
122 }], 122 }],
123 ['enable_register_protocol_handler==1', {
124 'feature_defines': [
125 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
126 ],
127 }],
123 ], 128 ],
124 # TODO: If the need arises, create a mechanism that will intelligently 129 # TODO: If the need arises, create a mechanism that will intelligently
125 # merge the lists rather than replace one with the other. This may 130 # merge the lists rather than replace one with the other. This may
126 # require changes in gyp. 131 # require changes in gyp.
127 }, 132 },
128 133
129 } 134 }
130 135
131 # Local Variables: 136 # Local Variables:
132 # tab-width:2 137 # tab-width:2
133 # indent-tabs-mode:nil 138 # indent-tabs-mode:nil
134 # End: 139 # End:
135 # vim: set expandtab tabstop=2 shiftwidth=2: 140 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698