diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 07:38:23 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 07:38:23 +0000 |
| commit | 5f16f8a29f001c9d7f505ad4a27030d8bdd1d71a (patch) | |
| tree | ecca3454811a019c7a9b169c20ace79c236fb476 /build | |
| parent | c45f197ed2d12b4f16a3d3ab05040d7c58e479b0 (diff) | |
| download | chromium_src-5f16f8a29f001c9d7f505ad4a27030d8bdd1d71a.zip chromium_src-5f16f8a29f001c9d7f505ad4a27030d8bdd1d71a.tar.gz chromium_src-5f16f8a29f001c9d7f505ad4a27030d8bdd1d71a.tar.bz2 | |
Disable WebUI TaskManager on Desktop Chrome (Win/Mac/Linux)
This CL disables WebUI TaskManager on Desktop Chrome (Win/Mac/Linux) since it won't be shipped with the final decision. But it is still enabled on ChromeOS.
This is a revert patch of http://crrev.com/122806.
BUG=99029
TEST=manual
Review URL: http://codereview.chromium.org/9690017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2650778..e58abb2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -150,8 +150,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', @@ -383,6 +383,11 @@ 'file_manager_extension%': 0, }], + # Enable WebUI TaskManager on Chrome OS or Aura. + ['chromeos==1 or use_aura==1', { + 'webui_task_manager%': 1, + }], + # For now one-click signin is enabled only for windows since the UI # is not yet complete for other platforms. ['OS=="win"', { |