GN fixes for the Windows build.

ui/views/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("views.gyp") ],
@@ skipping 40 matching lines @@
   if (use_x11 && !is_chromeos) {
     #deps += [ '../display/display.gyp:display_util' ]  TODO(GYP)
   }
   if (is_linux && !is_chromeos) {
     sources -= [ "window/window_button_order_provider.cc" ]
     #deps += [ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs' ]  TODO(GYP)
   } else {
     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_linux) {
+      # Already removed in non-Linux case.
+      sources -= [
+        "linux_ui/status_icon_linux.h",

[scottmg, 2014/07/17 19:55:49]

maybe is_chromeos would be better if that's the same. if (is_linux) { remove
linux; } seems weird.

[brettw, 2014/07/17 20:05:59]

Done.

+        "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.
     libs = [ "/imm32.lib", "oleacc.lib" ]
     ldflags = [ "/DELAYLOAD:user32.dll" ]
     deps += [
       "//third_party/iaccessible2",
       "//third_party/wtl",
@@ skipping 174 matching lines @@
       "//ui/compositor",
       "//ui/resources",
       "//ui/resources:ui_test_pak",
       "//ui/string",
       "//ui/wm",
     ]
   }
 }
 
 }  # if false