ash: Remove OS_CHROMEOS ifdefs from accelerator files

ash/host/ash_window_tree_host_x11.cc

 // Copyright 2014 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 "ash/host/ash_window_tree_host_x11.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
@@ skipping 129 matching lines @@
 gfx::Transform AshWindowTreeHostX11::GetInverseRootTransform() const {
   return transformer_helper_.GetInverseTransform();
 }
 
 void AshWindowTreeHostX11::UpdateRootWindowSizeInPixels(
     const gfx::Size& host_size_in_pixels) {
   transformer_helper_.UpdateWindowSize(host_size_in_pixels);
 }
 
 void AshWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) {
-#if defined(OS_CHROMEOS)
   SetCrOSTapPaused(!show);
-#endif
 }
 
 void AshWindowTreeHostX11::OnWindowInitialized(aura::Window* window) {}
 
 void AshWindowTreeHostX11::OnHostInitialized(aura::WindowTreeHost* host) {
   if (host != AsWindowTreeHost())
     return;
 
-#if defined(OS_CHROMEOS)
   // We have to enable Tap-to-click by default because the cursor is set to
   // visible in Shell::InitRootWindowController.
   SetCrOSTapPaused(false);
-#endif
 }
 
 void AshWindowTreeHostX11::OnConfigureNotify() {
   // Always update barrier and mouse location because |bounds_| might
   // have already been updated in |SetBounds|.
   if (pointer_barriers_) {
     UnConfineCursor();
     ConfineCursorToRootWindow();
   }
 }
 
 bool AshWindowTreeHostX11::CanDispatchEvent(const ui::PlatformEvent& event) {
   if (!WindowTreeHostX11::CanDispatchEvent(event))
     return false;
   XEvent* xev = event;
   ui::EventType type = ui::EventTypeFromNative(xev);
   // For touch event, check if the root window is residing on the according
   // touch display.
   switch (type) {
     case ui::ET_TOUCH_MOVED:
     case ui::ET_TOUCH_PRESSED:
     case ui::ET_TOUCH_CANCELLED:
     case ui::ET_TOUCH_RELEASED: {
-#if defined(OS_CHROMEOS)
       XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
       int64_t touch_display_id =
           ui::DeviceDataManager::GetInstance()->GetTargetDisplayForTouchDevice(
               xiev->deviceid);
       // If we don't have record of display id for this touch device, check
       // that if the event is within the bound of the root window. Note
       // that in multi-monitor case, the event position is in framebuffer
       // space so the bounds check will not work so well.
       if (touch_display_id == display::kInvalidDisplayId) {
         if (base::SysInfo::IsRunningOnChromeOS() &&
             !bounds().Contains(
                 gfx::ToFlooredPoint(ui::EventLocationFromNative(xev))))
           return false;
       } else {
         display::Screen* screen = display::Screen::GetScreen();
         display::Display display = screen->GetDisplayNearestWindow(window());
         return touch_display_id == display.id();
       }
-#endif  // defined(OS_CHROMEOS)
       return true;
     }
     default:
       return true;
   }
 }
+
 void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
     ui::LocatedEvent* event) {
   TranslateLocatedEvent(event);
   SendEventToProcessor(event);
 }
 
 ui::EventDispatchDetails AshWindowTreeHostX11::DispatchKeyEventPostIME(
     ui::KeyEvent* event) {
   input_method_handler()->SetPostIME(true);
   ui::EventDispatchDetails details =
       event_processor()->OnEventFromSource(event);
   if (!details.dispatcher_destroyed)
     input_method_handler()->SetPostIME(false);
   return details;
 }
 
-#if defined(OS_CHROMEOS)
 void AshWindowTreeHostX11::SetCrOSTapPaused(bool state) {
   if (!ui::IsXInput2Available())
     return;
   // Temporarily pause tap-to-click when the cursor is hidden.
   Atom prop = atom_cache()->GetAtom("Tap Paused");
   unsigned char value = state;
   const XIDeviceList& dev_list =
       ui::DeviceListCacheX11::GetInstance()->GetXI2DeviceList(xdisplay());
 
   // Only slave pointer devices could possibly have tap-paused property.
   for (int i = 0; i < dev_list.count; i++) {
     if (dev_list[i].use == XISlavePointer) {
       Atom old_type;
       int old_format;
       unsigned long old_nvalues, bytes;
       unsigned char* data;
       int result = XIGetProperty(xdisplay(), dev_list[i].deviceid, prop, 0, 0,
                                  False, AnyPropertyType, &old_type, &old_format,
                                  &old_nvalues, &bytes, &data);
       if (result != Success)
         continue;
       XFree(data);
       XIChangeProperty(xdisplay(), dev_list[i].deviceid, prop, XA_INTEGER, 8,
                        PropModeReplace, &value, 1);
     }
   }
 }
-#endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash