Revert 283946 "GN fixes for the Windows build."

Compilation error visible in try jobs of original review.

> GN fixes for the Windows build.
> 
> R=scottmg@chromium.org
> TBR=scottmg
> 
> Review URL: https://codereview.chromium.org/404603002

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/400493006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283948 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 13 insertions, 18 deletions

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 9b610d7..f27a5a4 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -56,6 +56,7 @@ component("ash") {
 
   if (is_win) {
     sources -= [
+      "host/window_tree_host_factory.cc",
       "sticky_keys/sticky_keys_controller.cc",
       "sticky_keys/sticky_keys_controller.h",
     ]
@@ -75,6 +76,8 @@ 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",
     ]
   }
 
@@ -99,11 +102,6 @@ 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 -= [
       "touch/touch_transformer_controller.cc",
       "touch/touch_transformer_controller.h",
     ]
diff --git a/ash/ash.gyp b/ash/ash.gyp
index b47fbb9..544f089 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -916,6 +916,7 @@
         ['OS=="win"', {
           'sources!': [
             # Note: sources list duplicated in GN build.
+            "host/window_tree_host_factory.cc",
             "sticky_keys/sticky_keys_controller.cc",
             "sticky_keys/sticky_keys_controller.h",
           ],
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index f2a4a25..0807950 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -682,6 +682,12 @@
       'browser/extensions/api/music_manager_private/device_id_win.cc',
       'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
       'browser/extensions/api/music_manager_private/music_manager_private_api.h',
+      'browser/extensions/api/networking_private/networking_private_api.h',
+      'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
+      'browser/extensions/api/networking_private/networking_private_event_router.h',
+      'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
+      'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+      'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
       'browser/extensions/api/notifications/notifications_api.cc',
       'browser/extensions/api/notifications/notifications_api.h',
       'browser/extensions/api/omnibox/omnibox_api.cc',
@@ -901,15 +907,11 @@
     ],
     'chrome_browser_extensions_networking_private_sources': [
       'browser/extensions/api/networking_private/networking_private_api.h',
-      'browser/extensions/api/networking_private/networking_private_api.h',
-      'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
       'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
       'browser/extensions/api/networking_private/networking_private_credentials_getter.h',
       'browser/extensions/api/networking_private/networking_private_credentials_getter_mac.cc',
       'browser/extensions/api/networking_private/networking_private_credentials_getter_win.cc',
       'browser/extensions/api/networking_private/networking_private_event_router.h',
-      'browser/extensions/api/networking_private/networking_private_event_router.h',
-      'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
       'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
       'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
       'browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc',
diff --git a/components/storage_monitor/BUILD.gn b/components/storage_monitor/BUILD.gn
index a6e02b1..d0404c9 100644
--- a/components/storage_monitor/BUILD.gn
+++ b/components/storage_monitor/BUILD.gn
@@ -66,8 +66,7 @@ static_library("storage_monitor") {
     deps += [
       "//device/udev_linux",
     ]
-  } else if (is_linux) {
-    # These were already removed for non-Linux.
+  } else {
     sources -= [
       "storage_monitor_linux.cc",
       "storage_monitor_linux.h",
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index f572463..8839d0f 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -58,15 +58,10 @@ component("views") {
     sources -= [
       "linux_ui/linux_ui.h",
       "linux_ui/linux_ui.cc",
-      "linux_ui/window_button_order_observer.h",
-      "linux_ui/window_button_order_provider.cc",
-    ]
-  }
-
-  if (is_chromeos) {
-    sources -= [
       "linux_ui/status_icon_linux.h",
       "linux_ui/status_icon_linux.cc",
+      "linux_ui/window_button_order_observer.h",
+      "linux_ui/window_button_order_provider.cc",
     ]
   }