diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 23:06:44 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 23:06:44 +0000 |
| commit | f2d5ff0926f44cdfe39ff9d14e30f5101005dc43 (patch) | |
| tree | 31e3af842d28044ee2f2be1cc41c758dc331f5d4 /build/common.gypi | |
| parent | 334056ecaf6ef6004a7d30b1c7c2efc86eeea99d (diff) | |
| download | chromium_src-f2d5ff0926f44cdfe39ff9d14e30f5101005dc43.zip chromium_src-f2d5ff0926f44cdfe39ff9d14e30f5101005dc43.tar.gz chromium_src-f2d5ff0926f44cdfe39ff9d14e30f5101005dc43.tar.bz2 | |
Back out r121079 from the trunk, because it was checked in without permission
to a closed tree.
Back to WebUI Task Manager, since M18 branch point has been passed.
Revert 119612 - WebUI TaskManager: Turn it off by default on Win/Mac/Linux
WebUI Task Manager does not ship on M18 on Desktop Chromes (Win/Mac/Linux) so that task manager have been disabled temporary. On Chrome OS and Aura, it is still enabled.
BUG=97429
TEST=manual on linux and aura
Review URL: http://codereview.chromium.org/9290042
TBR=yoshiki@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9361050
TBR=yoshiki@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 8b737d3..5c5847e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -136,8 +136,8 @@ # Disable file manager component extension by default. 'file_manager_extension%': 0, - # Enable WebUI TaskManager by default. - 'webui_task_manager%': 1, + # Disable WebUI TaskManager by default. + 'webui_task_manager%': 0, # Python version. 'python_ver%': '2.6', @@ -358,7 +358,7 @@ 'file_manager_extension%': 0, }], - # Enable WebUI TaskManager always on Chrome OS or Aura. + # Enable WebUI TaskManager on Chrome OS or Aura. ['chromeos==1 or use_aura==1', { 'webui_task_manager%': 1, }], |