Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_view.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc |
| index 4e852a14c7ed8a2fac06df80d64d460871eab8d6..e2a73d4f0a1ca08acfa3661c96d1767538562675 100644 |
| --- a/chrome/browser/ui/views/frame/browser_view.cc |
| +++ b/chrome/browser/ui/views/frame/browser_view.cc |
| @@ -1052,12 +1052,16 @@ void BrowserView::ShowCompactLocationBarUnderSelectedTab() { |
| void BrowserView::ShowTaskManager() { |
| // Uses WebUI TaskManager when swiches is set. It is beta feature. |
| +#if !defined(TOUCH_UI) |
|
mazda
2011/07/19 10:05:07
How about enclosing the block with one if-else cla
yoshiki
2011/07/20 07:39:00
Done.
|
| if (CommandLine::ForCurrentProcess() |
| ->HasSwitch(switches::kEnableWebUITaskManager)) { |
| +#endif |
| TaskManagerDialog::Show(); |
| +#if !defined(TOUCH_UI) |
| } else { |
| browser::ShowTaskManager(); |
| } |
| +#endif |
| } |
| void BrowserView::ShowBackgroundPages() { |