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

Side by Side Diff: trunk/src/build/common.gypi

Issue 14631021: Revert 199625 "Remove ENABLE_MESSAGE_CENTER" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | « trunk/src/ash/test/ash_test_helper.cc ('k') | trunk/src/chrome/browser/about_flags.cc » ('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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'enable_touch_ui%': 1, 148 'enable_touch_ui%': 1,
149 }], 149 }],
150 150
151 # Enable App Launcher only on ChromeOS, Windows and OSX. 151 # Enable App Launcher only on ChromeOS, Windows and OSX.
152 ['use_ash==1 or OS=="win" or OS=="mac"', { 152 ['use_ash==1 or OS=="win" or OS=="mac"', {
153 'enable_app_list%': 1, 153 'enable_app_list%': 1,
154 }, { 154 }, {
155 'enable_app_list%': 0, 155 'enable_app_list%': 0,
156 }], 156 }],
157 157
158 # Enable Message Center only on ChromeOS, Windows, and Mac for now.
159 ['use_ash==1 or OS=="win" or OS=="mac"', {
160 'enable_message_center%': 1,
161 }, {
162 'enable_message_center%': 0,
163 }],
164
158 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', { 165 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', {
159 'use_default_render_theme%': 1, 166 'use_default_render_theme%': 1,
160 }, { 167 }, {
161 'use_default_render_theme%': 0, 168 'use_default_render_theme%': 0,
162 }], 169 }],
163 170
164 # TODO(thestig) Remove the linux_lsb_release check after all the 171 # TODO(thestig) Remove the linux_lsb_release check after all the
165 # official Ubuntu Lucid builder are gone. 172 # official Ubuntu Lucid builder are gone.
166 ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chr omeos==0', { 173 ['OS=="linux" and branding=="Chrome" and buildtype=="Official" and chr omeos==0', {
167 'linux_lsb_release%': '<!(lsb_release -r -s)', 174 'linux_lsb_release%': '<!(lsb_release -r -s)',
(...skipping 12 matching lines...) Expand all
180 'use_aura%': '<(use_aura)', 187 'use_aura%': '<(use_aura)',
181 'use_ash%': '<(use_ash)', 188 'use_ash%': '<(use_ash)',
182 'use_ozone%': '<(use_ozone)', 189 'use_ozone%': '<(use_ozone)',
183 'use_openssl%': '<(use_openssl)', 190 'use_openssl%': '<(use_openssl)',
184 'enable_viewport%': '<(enable_viewport)', 191 'enable_viewport%': '<(enable_viewport)',
185 'enable_hidpi%': '<(enable_hidpi)', 192 'enable_hidpi%': '<(enable_hidpi)',
186 'enable_touch_ui%': '<(enable_touch_ui)', 193 'enable_touch_ui%': '<(enable_touch_ui)',
187 'android_webview_build%': '<(android_webview_build)', 194 'android_webview_build%': '<(android_webview_build)',
188 'google_tv%': '<(google_tv)', 195 'google_tv%': '<(google_tv)',
189 'enable_app_list%': '<(enable_app_list)', 196 'enable_app_list%': '<(enable_app_list)',
197 'enable_message_center%': '<(enable_message_center)',
190 'use_default_render_theme%': '<(use_default_render_theme)', 198 'use_default_render_theme%': '<(use_default_render_theme)',
191 'buildtype%': '<(buildtype)', 199 'buildtype%': '<(buildtype)',
192 'branding%': '<(branding)', 200 'branding%': '<(branding)',
193 'arm_version%': '<(arm_version)', 201 'arm_version%': '<(arm_version)',
194 'linux_lsb_release%': '<(linux_lsb_release)', 202 'linux_lsb_release%': '<(linux_lsb_release)',
195 203
196 # Set to 1 to enable fast builds. Set to 2 for even faster builds 204 # Set to 1 to enable fast builds. Set to 2 for even faster builds
197 # (it disables debug info for fastest compilation - only for use 205 # (it disables debug info for fastest compilation - only for use
198 # on compile-only bots). 206 # on compile-only bots).
199 'fastbuild%': 0, 207 'fastbuild%': 0,
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 'disable_ftp_support%': '<(disable_ftp_support)', 796 'disable_ftp_support%': '<(disable_ftp_support)',
789 'enable_task_manager%': '<(enable_task_manager)', 797 'enable_task_manager%': '<(enable_task_manager)',
790 'sas_dll_path%': '<(sas_dll_path)', 798 'sas_dll_path%': '<(sas_dll_path)',
791 'wix_path%': '<(wix_path)', 799 'wix_path%': '<(wix_path)',
792 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 800 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
793 'use_system_libjpeg%': '<(use_system_libjpeg)', 801 'use_system_libjpeg%': '<(use_system_libjpeg)',
794 'android_webview_build%': '<(android_webview_build)', 802 'android_webview_build%': '<(android_webview_build)',
795 'gyp_managed_install%': 0, 803 'gyp_managed_install%': 0,
796 'google_tv%': '<(google_tv)', 804 'google_tv%': '<(google_tv)',
797 'enable_app_list%': '<(enable_app_list)', 805 'enable_app_list%': '<(enable_app_list)',
806 'enable_message_center%': '<(enable_message_center)',
798 'use_default_render_theme%': '<(use_default_render_theme)', 807 'use_default_render_theme%': '<(use_default_render_theme)',
799 'enable_settings_app%': '<(enable_settings_app)', 808 'enable_settings_app%': '<(enable_settings_app)',
800 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 809 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
801 'google_api_key%': '<(google_api_key)', 810 'google_api_key%': '<(google_api_key)',
802 'google_default_client_id%': '<(google_default_client_id)', 811 'google_default_client_id%': '<(google_default_client_id)',
803 'google_default_client_secret%': '<(google_default_client_secret)', 812 'google_default_client_secret%': '<(google_default_client_secret)',
804 'enable_managed_users%': '<(enable_managed_users)', 813 'enable_managed_users%': '<(enable_managed_users)',
805 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)', 814 'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
806 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 815 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
807 816
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after
2185 }], 2194 }],
2186 ['enable_printing==1', { 2195 ['enable_printing==1', {
2187 'defines': ['ENABLE_PRINTING=1'], 2196 'defines': ['ENABLE_PRINTING=1'],
2188 }], 2197 }],
2189 ['enable_captive_portal_detection==1', { 2198 ['enable_captive_portal_detection==1', {
2190 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 2199 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
2191 }], 2200 }],
2192 ['enable_app_list==1', { 2201 ['enable_app_list==1', {
2193 'defines': ['ENABLE_APP_LIST=1'], 2202 'defines': ['ENABLE_APP_LIST=1'],
2194 }], 2203 }],
2204 ['enable_message_center==1', {
2205 'defines': ['ENABLE_MESSAGE_CENTER=1'],
2206 }],
2195 ['enable_settings_app==1', { 2207 ['enable_settings_app==1', {
2196 'defines': ['ENABLE_SETTINGS_APP=1'], 2208 'defines': ['ENABLE_SETTINGS_APP=1'],
2197 }], 2209 }],
2198 ['disable_ftp_support==1', { 2210 ['disable_ftp_support==1', {
2199 'defines': ['DISABLE_FTP_SUPPORT=1'], 2211 'defines': ['DISABLE_FTP_SUPPORT=1'],
2200 }], 2212 }],
2201 ['enable_managed_users==1', { 2213 ['enable_managed_users==1', {
2202 'defines': ['ENABLE_MANAGED_USERS=1'], 2214 'defines': ['ENABLE_MANAGED_USERS=1'],
2203 }], 2215 }],
2204 ['spdy_proxy_auth_origin != ""', { 2216 ['spdy_proxy_auth_origin != ""', {
(...skipping 2235 matching lines...) Expand 10 before | Expand all | Expand 10 after
4440 # settings in target dicts. SYMROOT is a special case, because many other 4452 # settings in target dicts. SYMROOT is a special case, because many other
4441 # Xcode variables depend on it, including variables such as 4453 # Xcode variables depend on it, including variables such as
4442 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4454 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4443 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4455 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4444 # files to appear (when present) in the UI as actual files and not red 4456 # files to appear (when present) in the UI as actual files and not red
4445 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4457 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4446 # and therefore SYMROOT, needs to be set at the project level. 4458 # and therefore SYMROOT, needs to be set at the project level.
4447 'SYMROOT': '<(DEPTH)/xcodebuild', 4459 'SYMROOT': '<(DEPTH)/xcodebuild',
4448 }, 4460 },
4449 } 4461 }
OLDNEW
« no previous file with comments | « trunk/src/ash/test/ash_test_helper.cc ('k') | trunk/src/chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698