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

Unified Diff: build/common.gypi

Issue 7520011: WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6f8c1c282dc9cd005de077ef0da8cb2ec55b691a..b3fb7a73652a7587197d6c12439fcf7e5ed82af0 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -127,6 +127,9 @@
# Disable file manager component extension by default.
'file_manager_extension%': 0,
+ # Disable WebUI TaskManager by default.
+ 'webui_task_manager%': 0,
+
# Python version.
'python_ver%': '2.6',
@@ -244,6 +247,13 @@
'file_manager_extension%': 0,
}],
+ # Enable WebUI TaskManager only on Chrome OS and Touch UI.
+ ['chromeos==1 or touchui==1', {
+ 'webui_task_manager%': 1,
+ }, {
+ 'webui_task_manager%': 0,
+ }],
+
# Enable smooth scrolling for Linux and ChromeOS
['OS=="linux"', {
'enable_smooth_scrolling%': 1,
@@ -273,6 +283,7 @@
'touchui%': '<(touchui)',
'webui_certificate_viewer%': '<(webui_certificate_viewer)',
'file_manager_extension%': '<(file_manager_extension)',
+ 'webui_task_manager%': '<(webui_task_manager)',
'inside_chromium_build%': '<(inside_chromium_build)',
'fastbuild%': '<(fastbuild)',
'python_ver%': '<(python_ver)',
@@ -630,6 +641,9 @@
['file_manager_extension==1', {
'grit_defines': ['-D', 'file_manager_extension'],
}],
+ ['webui_task_manager==1', {
+ 'grit_defines': ['-D', 'webui_task_manager'],
+ }],
['remoting==1', {
'grit_defines': ['-D', 'remoting'],
}],
@@ -735,6 +749,9 @@
['file_manager_extension==1', {
'defines': ['FILE_MANAGER_EXTENSION=1'],
}],
+ ['webui_task_manager==1', {
+ 'defines': ['WEBUI_TASK_MANAGER=1'],
+ }],
['profiling==1', {
'defines': ['ENABLE_PROFILING=1'],
}],

Powered by Google App Engine
This is Rietveld 408576698