Revert of GN fixes for the Windows build.

ash/BUILD.gn

 # 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("ash.gyp") ],
@@ skipping 38 matching lines @@
     #'../ui/views/views.gyp:views'  TODO(GYP),
   ]
 
   forward_dependent_configs_from = [
     "//ash/resources",
     "//ash/strings",
   ]
 
   if (is_win) {
     sources -= [
+      "host/window_tree_host_factory.cc",
       "sticky_keys/sticky_keys_controller.cc",
       "sticky_keys/sticky_keys_controller.h",
     ]
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]
   }
 
   if (use_x11) {
     configs += [
       "//build/config/linux:xfixes",
     ]
   } else {
     sources -= [
       "accelerators/key_hold_detector.cc",
       "accelerators/key_hold_detector.h",
       "accelerators/magnifier_key_scroller.cc",
       "accelerators/magnifier_key_scroller.h",
       "accelerators/spoken_feedback_toggler.cc",
       "accelerators/spoken_feedback_toggler.h",
+      "touch/touch_transformer_controller.cc",
+      "touch/touch_transformer_controller.h",
     ]
   }
 
   if (is_chromeos) {
     deps += [
       #'../chromeos/chromeos.gyp:chromeos',  TODO(GYP)
       # Ash #includes power_supply_properties.pb.h directly.
       #'../chromeos/chromeos.gyp:power_manager_proto',  TODO(GYP)
       #'../device/bluetooth/bluetooth.gyp:device_bluetooth',  TODO(GYP)
       #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',  TODO(GYP)
       #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',  TODO(GYP)
       #'../ui/chromeos/ui_chromeos.gyp:ui_chromeos',  TODO(GYP)
       #'../ui/display/display.gyp:display',  TODO(GYP)
       #'../ui/display/display.gyp:display_util',  TODO(GYP)
     ]
   } else {
     sources -= [
       "display/display_configurator_animation.cc",
       "display/display_configurator_animation.h",
       "display/resolution_notification_controller.cc",
       "display/resolution_notification_controller.h",
       "system/tray/media_security/media_capture_observer.h",
       "system/tray/media_security/multi_profile_media_tray_item.cc",
       "system/tray/media_security/multi_profile_media_tray_item.h",
-    ]
-  }
-
-  if (!use_x11 || !is_chromeos) {
-    sources -= [
       "touch/touch_transformer_controller.cc",
       "touch/touch_transformer_controller.h",
     ]
   }
 }
 
 component("ash_with_content") {
   sources = [
     "content_support/ash_with_content_export.h",
     "content_support/gpu_support_impl.cc",
@@ skipping 238 matching lines @@
     #'../components/components.gyp:user_manager',  TODO(GYP)
     #'../content/content_shell_and_tests.gyp:test_support_content',  TODO(GYP)
   ]
 
   if (is_chromeos) {
     #deps += [ "//ui/display" ]  TODO(GYP)
   }
 }
 
 }  # if false