diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 09:53:16 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 09:53:16 +0000 |
| commit | e122960c1968c0aa73831b32b6e4fa6177132b5c (patch) | |
| tree | 46eb00a84802fe14edefa9d33f0e4afb838d27cc /build | |
| parent | 22126236f1cde4e1e8f4fd44a125e45446553939 (diff) | |
| download | chromium_src-e122960c1968c0aa73831b32b6e4fa6177132b5c.zip chromium_src-e122960c1968c0aa73831b32b6e4fa6177132b5c.tar.gz chromium_src-e122960c1968c0aa73831b32b6e4fa6177132b5c.tar.bz2 | |
Enable WebUI TaskManager by default.
Back to WebUI Task Manager, since M18 branch point has been passed.
BUG=99029
TEST=manual on linux and cros
Review URL: http://codereview.chromium.org/9355053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index 014e208..7c83479 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -136,8 +136,8 @@ # Disable file manager component extension by default. 'file_manager_extension%': 0, - # Disable WebUI TaskManager by default. - 'webui_task_manager%': 0, + # Enable WebUI TaskManager by default. + 'webui_task_manager%': 1, # Python version. 'python_ver%': '2.6', @@ -358,11 +358,6 @@ 'file_manager_extension%': 0, }], - # Enable WebUI TaskManager on Chrome OS or Aura. - ['chromeos==1 or use_aura==1', { - 'webui_task_manager%': 1, - }], - ['OS=="android"', { 'proprietary_codecs%': 1, 'enable_webrtc%': 0, |