diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 04:00:47 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-05 04:00:47 +0000 |
| commit | 8b2e9f39a057d4482a64b01249e02b77640faaf1 (patch) | |
| tree | d7e4783aafdec18af92fb59663cb47fb86c18f02 /build | |
| parent | d96ba8adb3b599399facb86b12f4414d828d36f3 (diff) | |
| download | chromium_src-8b2e9f39a057d4482a64b01249e02b77640faaf1.zip chromium_src-8b2e9f39a057d4482a64b01249e02b77640faaf1.tar.gz chromium_src-8b2e9f39a057d4482a64b01249e02b77640faaf1.tar.bz2 | |
WebUI TaskManager: make it default on Chrome OS
And fixes the code of task manager and following tests which didn't work correctly on WebUI TaskManager.
- TaskManagerBrowserTest.ShutdownWhileOpen
- ExtensionApiTest.ProcessesVsTaskManager
- PrerenderBrowserTest.PrerenderTaskManager
BUG=chromium-os:13885
TEST=trybots
Review URL: http://codereview.chromium.org/7550004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 9cff345..7361a11 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'], }], |