touch: Always expect XInput2 availability.

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 80 matching lines @@
 #include "chrome/browser/chromeos/enterprise_extension_observer.h"
 #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/network_state_notifier.h"
 #include "chrome/browser/chromeos/sms_observer.h"
 #include "chrome/browser/chromeos/update_observer.h"
 #include "chrome/browser/chromeos/wm_message_listener.h"
 #endif
 
-#if defined(HAVE_XINPUT2)
+#if defined(TOUCH_UI)
 #include "views/focus/accelerator_handler.h"
 #endif
 
 namespace {
 
 // SetAsDefaultBrowserTask ----------------------------------------------------
 
 class SetAsDefaultBrowserTask : public Task {
  public:
   SetAsDefaultBrowserTask();
@@ skipping 1258 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(HAVE_XINPUT2) && defined(TOUCH_UI)
+#if defined(TOUCH_UI)
   // 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.
   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;
@@ skipping 30 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }