GN Windows build fixes

Reland of https://codereview.chromium.org/404603002/ but without the problematic extensions.gypi changes.

R=agl@chromium.org, dalecurtis@chromium.org

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

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

6 files changed, 19 insertions, 13 deletions

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index f27a5a4..9b610d7 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 -= [
       "touch/touch_transformer_controller.cc",
       "touch/touch_transformer_controller.h",
     ]
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 78fe318..1f1e85f 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -918,7 +918,6 @@
         ['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/components/storage_monitor/BUILD.gn b/components/storage_monitor/BUILD.gn
index d0404c9..a6e02b1 100644
--- a/components/storage_monitor/BUILD.gn
+++ b/components/storage_monitor/BUILD.gn
@@ -66,7 +66,8 @@ static_library("storage_monitor") {
     deps += [
       "//device/udev_linux",
     ]
-  } else {
+  } else if (is_linux) {
+    # These were already removed for non-Linux.
     sources -= [
       "storage_monitor_linux.cc",
       "storage_monitor_linux.h",
diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn
index c0aa307..c8b104b 100644
--- a/ipc/BUILD.gn
+++ b/ipc/BUILD.gn
@@ -68,7 +68,6 @@ component("ipc") {
 
   if (is_win || is_ios) {
     sources -= [
-      "unix_domain_socket_acceptor.cc",
       "unix_domain_socket_util.cc",
     ]
   }
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 6b710be..5f5871d 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -32,9 +32,9 @@ config("media_config") {
   }
 }
 
-if (is_win) {
-  config("media_dependent_config") {
-    ldflags += [
+config("media_dependent_config") {
+  if (is_win) {
+    ldflags = [
       "/DELAYLOAD:mf.dll",
       "/DELAYLOAD:mfplat.dll",
       "/DELAYLOAD:mfreadwrite.dll",
@@ -354,7 +354,9 @@ component("media") {
   ]
 
   configs += [ ":media_config", ]
+  all_dependent_configs = [ ":media_dependent_config" ]
 
+  cflags = []
   libs = []
   defines = []
   deps = []
@@ -555,8 +557,6 @@ component("media") {
       "/wd4267"  # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
                  # http://crbug.com/171009
     ]
-    configs += [ ":media_dependent_config" ]
-    all_dependent_configs = [ ":media_dependent_config" ]
   }
 
   if (proprietary_codecs) {
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
index 8839d0f..f572463 100644
--- a/ui/views/BUILD.gn
+++ b/ui/views/BUILD.gn
@@ -58,13 +58,18 @@ component("views") {
     sources -= [
       "linux_ui/linux_ui.h",
       "linux_ui/linux_ui.cc",
-      "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",
     ]
   }
 
+  if (is_chromeos) {
+    sources -= [
+      "linux_ui/status_icon_linux.h",
+      "linux_ui/status_icon_linux.cc",
+    ]
+  }
+
   if (is_win) {
     sources += gypi_values.views_win_sources
     cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.