Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/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 268 matching lines @@
 
 gfx::Transform AshWindowTreeHostX11::GetInverseRootTransform() const {
   return transformer_helper_.GetInverseTransform();
 }
 
 void AshWindowTreeHostX11::UpdateRootWindowSize(const gfx::Size& host_size) {
   transformer_helper_.UpdateWindowSize(host_size);
 }
 
 void AshWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) {
-#if defined(OS_CHROMEOS)
   SetCrOSTapPaused(!show);
-#endif
 }
 
 void AshWindowTreeHostX11::OnWindowInitialized(aura::Window* window) {}
 
 void AshWindowTreeHostX11::OnHostInitialized(aura::WindowTreeHost* host) {
   // UpdateIsInternalDisplay relies on RootWindowSettings' display_id being set
   // available by the time WED::Init is called. (set in
   // DisplayManager::CreateRootWindowForDisplay)
   // Ready when NotifyHostInitialized is called from WED::Init.
   if (host != AsWindowTreeHost())
     return;
   UpdateIsInternalDisplay();
 
-#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() {
   UpdateIsInternalDisplay();
 
   // Always update barrier and mouse location because |bounds_| might
   // have already been updated in |SetBounds|.
   if (pointer_barriers_) {
     UnConfineCursor();
     ConfineCursorToRootWindow();
   }
 }
 
 void AshWindowTreeHostX11::TranslateAndDispatchLocatedEvent(
     ui::LocatedEvent* event) {
   switch (event->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)
       ui::TouchEvent* touchev = static_cast<ui::TouchEvent*>(event);
       if (base::SysInfo::IsRunningOnChromeOS()) {
         // X maps the touch-surface to the size of the X root-window.
         // In multi-monitor setup, Coordinate Transformation Matrix
         // repositions the touch-surface onto part of X root-window
         // containing aura root-window corresponding to the touchscreen.
         // However, if aura root-window has non-zero origin,
         // we need to relocate the event into aura root-window coordinates.
         touchev->Relocate(bounds().origin());
 #if defined(USE_XI2_MT)
         if (is_internal_display_)
           touch_calibrate_->Calibrate(touchev, bounds());
 #endif  // defined(USE_XI2_MT)
       }
-#endif  // defined(OS_CHROMEOS)
       break;
     }
     default: {
       aura::Window* root_window = window();
       aura::client::ScreenPositionClient* screen_position_client =
           aura::client::GetScreenPositionClient(root_window);
       gfx::Rect local(bounds().size());
       local.Inset(transformer_helper_.GetHostInsets());
       if (screen_position_client && !local.Contains(event->location())) {
         gfx::Point location(event->location());
@@ skipping 15 matching lines @@
 }
 
 void AshWindowTreeHostX11::UpdateIsInternalDisplay() {
   aura::Window* root_window = window();
   gfx::Screen* screen = gfx::Screen::GetScreenFor(root_window);
   gfx::Display display = screen->GetDisplayNearestWindow(root_window);
   DCHECK(display.is_valid());
   is_internal_display_ = display.IsInternal();
 }
 
-#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;
   XIDeviceList dev_list =
       ui::DeviceListCacheX::GetInstance()->GetXI2DeviceList(xdisplay());
 
   // Only slave pointer devices could possibly have tap-paused property.
@@ skipping 22 matching lines @@
                        dev_list[i].deviceid,
                        prop,
                        XA_INTEGER,
                        8,
                        PropModeReplace,
                        &value,
                        1);
     }
   }
 }
-#endif
 
 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) {
   return new AshWindowTreeHostX11(initial_bounds);
 }
 
 }  // namespace ash