WebUI TaskManager: make it default on touch UI

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1034 matching lines @@
 
 void BrowserView::ShowCompactLocationBarUnderSelectedTab() {
   if (!UseCompactNavigationBar())
     return;
   compact_location_bar_view_host_->UpdateOnTabChange(browser()->active_index(),
                                                      true);
 }
 
 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 clause?

#if defined(TOUCH_UI)
   TaskManagerDialog::Show();
#else
   if (CommandLine::ForCurrentProcess()
         ->HasSwitch(switches::kEnableWebUITaskManager)) {
     TaskManagerDialog::Show();
   } else {
     browser::ShowTaskManager();
   }
#endif  // defined(TOUCH_UI)

[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() {
   browser::ShowBackgroundPages();
 }
 
 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
   GetLocationBarView()->ShowStarBubble(url, !already_bookmarked);
 }
 
@@ skipping 1570 matching lines @@
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }