GN Windows build fixes

ash/BUILD.gn

Index: ash/BUILD.gn
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index f27a5a486ea863b43156b2ee8df014562e1c0b85..9b610d7dcf5b6acf6ce692df76a74ea98374fa3f 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -56,7 +56,6 @@ component("ash") {
 
   if (is_win) {
     sources -= [
-      "host/window_tree_host_factory.cc",
       "sticky_keys/sticky_keys_controller.cc",
       "sticky_keys/sticky_keys_controller.h",
     ]
@@ -76,8 +75,6 @@ component("ash") {
       "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",
     ]
   }
 
@@ -102,6 +99,11 @@ component("ash") {
       "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 -= [

[DaleCurtis, 2014/07/18 18:24:06]

It's unfortunate this pattern has already spread.

       "touch/touch_transformer_controller.cc",
       "touch/touch_transformer_controller.h",
     ]