diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 06:49:14 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 06:49:14 +0000 |
| commit | 1aec5bd021a04698f4b627bb9de361b816037730 (patch) | |
| tree | c81834017bf9ddfb4940dd7d55b0e26c1dbfe005 /chrome/browser/ui/views/frame | |
| parent | 9d3d9fae9ca6c4f06bd646474feacfb2ff357296 (diff) | |
| download | chromium_src-1aec5bd021a04698f4b627bb9de361b816037730.zip chromium_src-1aec5bd021a04698f4b627bb9de361b816037730.tar.gz chromium_src-1aec5bd021a04698f4b627bb9de361b816037730.tar.bz2 | |
WebUI TaskManager: make it default on Chrome OS
Got the approval from Linus to ship this on Chrome OS in M14
(cf. Comment 20 on http://crbug.com/69222)
And makes some tests disabled since they are currently failing on WebUI TaskManager.
BUG=chromium-os:13885
TEST=manual on chromeos-chrome in linux
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=93908
Review URL: http://codereview.chromium.org/7465026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/frame')
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 735ecd9..bcfbb53 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -1051,7 +1051,7 @@ void BrowserView::ShowCompactLocationBarUnderSelectedTab() { } void BrowserView::ShowTaskManager() { -#if defined(TOUCH_UI) +#if defined(TOUCH_UI) || defined(OS_CHROMEOS) TaskManagerDialog::Show(); #else // Uses WebUI TaskManager when swiches is set. It is beta feature. @@ -1061,7 +1061,7 @@ void BrowserView::ShowTaskManager() { } else { browser::ShowTaskManager(); } -#endif // defined(TOUCH_UI) +#endif // defined(TOUCH_UI) || defined(OS_CHROMEOS) } void BrowserView::ShowBackgroundPages() { |