touchui: Update a couple of command-line flags.

chrome/browser/ui/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 90 matching lines @@
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/chromeos/low_battery_observer.h"
 #include "chrome/browser/chromeos/network_message_observer.h"
 #include "chrome/browser/chromeos/sms_observer.h"
 #include "chrome/browser/chromeos/update_observer.h"
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_message_listener.h"
 #endif
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 #include "ui/base/touch/touch_factory.h"
 #endif
 
 namespace {
 
 // SetAsDefaultBrowserTask ----------------------------------------------------
 
 class SetAsDefaultBrowserTask : public Task {
  public:
   SetAsDefaultBrowserTask();
@@ skipping 1358 matching lines @@
   }
 
 #if defined(OS_CHROMEOS)
   // The browser will be launched after the user logs in.
   if (command_line.HasSwitch(switches::kLoginManager) ||
       command_line.HasSwitch(switches::kLoginPassword)) {
     silent_launch = true;
   }
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
   // Get a list of pointer-devices that should be treated as touch-devices.
-  // TODO(sad): Instead of/in addition to getting the list from the
-  // command-line, query X for a list of touch devices.
+  // This is primarily used for testing/debugging touch-event processing when a
+  // touch-device isn't available.
   std::string touch_devices =
     command_line.GetSwitchValueASCII(switches::kTouchDevices);
 
   if (!touch_devices.empty()) {
     std::vector<std::string> devs;
     std::vector<unsigned int> device_ids;
     unsigned int devid;
     base::SplitString(touch_devices, ',', &devs);
     for (std::vector<std::string>::iterator iter = devs.begin();
         iter != devs.end(); ++iter) {
-      if (base::StringToInt(*iter, reinterpret_cast<int*>(&devid))) {
+      if (base::StringToInt(*iter, reinterpret_cast<int*>(&devid)))
         device_ids.push_back(devid);
-      } else {
+      else
         DLOG(WARNING) << "Invalid touch-device id: " << *iter;
-      }
     }
     ui::TouchFactory::GetInstance()->SetTouchDeviceList(device_ids);
   }
 #endif
 
   // If we don't want to launch a new browser window or tab (in the case
   // of an automation request), we are done here.
   if (!silent_launch) {
     IsProcessStartup is_process_startup = process_startup ?
         IS_PROCESS_STARTUP : IS_NOT_PROCESS_STARTUP;
@@ skipping 15 matching lines @@
   if (!automation->InitializeChannel(channel_id))
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list = g_browser_process->GetAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }