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

Unified Diff: build/common.gypi

Issue 7550004: WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the initializing of observer before the loading. 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
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_processes_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9eb94f3b62828aa0d7dc85ee997c64c58eb56e2f..842943f40a9a02ea4feeee9d8035036b6a40aacf 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -129,6 +129,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',
@@ -252,6 +255,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,
@@ -281,6 +291,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)',
@@ -639,6 +650,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'],
}],
@@ -747,6 +761,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'],
}],
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_processes_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698