Fix chrome target in Windows GN build.

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

Cr-Commit-Position: refs/heads/master@{#314031}

BUILD.gn

@@ -301,41 +301,4 @@ group("root") {
   if (is_mac || is_ios) {
     deps -= [ "//ui/touch_selection" ]
   }
-
-  if (is_win) {
-    deps -= [
-      "//apps",
-      "//ash",
-      "//chrome/browser",
-      "//chrome/browser/devtools",
-      "//chrome/common",
-      "//chrome/plugin",
-      "//chrome/renderer",
-      "//chrome/test",
-      "//chrome/utility",
-      "//components:all_components",
-      "//cc/blink",
-      "//content",
-      "//content/shell:content_shell",
-      "//content/test:test_support",
-      "//extensions/browser",
-      "//extensions/common",
-      "//extensions/renderer",
-      "//media/blink",
-      "//mojo",
-      "//pdf",
-      "//ppapi:ppapi_c",
-      "//printing",
-      "//remoting/client/plugin",
-      "//third_party/WebKit/public:all_blink",
-      "//ui/app_list",
-      "//ui/aura",
-      "//ui/keyboard",
-      "//ui/snapshot",
-      "//ui/views",
-      "//ui/views/controls/webview",
-      "//ui/web_dialogs",
-      "//ui/wm",
-    ]
-  }
 }

build/config/win/BUILD.gn

@@ -63,6 +63,12 @@ config("common_linker_setup") {
     "/ignore:4199",
     "/ignore:4221",
     "/NXCOMPAT",
+
+    # Suggested by Microsoft Devrel to avoid
+    #   LINK : fatal error LNK1248: image size (80000000)
+    #   exceeds maximum allowable size (80000000)
+    # which started happening more regularly after VS2013 Update 4.
+    "/maxilksize:2147483647",
   ]
 
   # ASLR makes debugging with windbg difficult because Chrome.exe and

chrome/BUILD.gn

@@ -32,22 +32,49 @@ if (!is_android) {
     if (is_win) {
       sources += [
         "$target_gen_dir/chrome_exe_version.rc",
+        "app/chrome_crash_reporter_client.cc",
+        "app/chrome_crash_reporter_client.h",
+        "app/chrome_exe.rc",
         "app/chrome_exe_main_win.cc",
         "app/client_util.cc",
         "app/client_util.h",
+        "app/chrome_watcher_command_line_win.cc",
+        "app/chrome_watcher_command_line_win.h",
         "app/signature_validator_win.cc",
         "app/signature_validator_win.h",
+        "common/crash_keys.cc",
+        "common/crash_keys.h'",
         "//content/app/startup_helper_win.cc",
+        "//content/public/common/content_switches.cc",
       ]
       deps += [
         ":chrome_version_resources",
         ":image_pre_reader",
+        ":main_dll",
+
+        # 'chrome_nacl_win64" TODO(GYP)
+        # '../win8/delegate_execute/delegate_execute.gyp:*', TODO(GYP)
+        # '../win8/metro_driver/metro_driver.gyp:metro_driver', TODO(GYP)
+        "//base",
+        "//breakpad:breakpad_handler",
+        "//breakpad:breakpad_sender",
         "//chrome/browser:chrome_process_finder",
         "//chrome/chrome_watcher",
         "//chrome/chrome_watcher:client",
+        "//chrome/installer/util",
+        "//chrome_elf",
         "//components/browser_watcher:browser_watcher_client",
+        "//components/crash/app",
+        "//crypto",
+        "//sandbox",
         "//ui/gfx",
       ]
+      libs = [
+        "wintrust.lib",
+        "crypt32.lib",
+      ]
+      configs -= [ "//build/config/win:console" ]
+      configs += [ "//build/config/win:windowed" ]
     } else if (use_aura) {
       # Non-Windows aura entrypoint.
       sources += [ "app/chrome_exe_main_aura.cc" ]
@@ -99,6 +126,7 @@ if (!is_android) {
       deps += [
         ":packed_extra_resources",
         ":packed_resources",
+        "//components/startup_metric_utils",
 
         # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
         # file decide what to do on a per-OS basis; on Mac, internal plugins

chrome/browser/BUILD.gn

@@ -653,6 +653,8 @@ static_library("browser") {
       "//chrome_elf",
       "//chrome_elf:constants",
       "//chrome_elf:dll_hash",
+      "//components/browser_watcher",
+      "//components/browser_watcher:browser_watcher_client",
       "//google_update",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
@@ -660,6 +662,7 @@ static_library("browser") {
       "//ui/metro_viewer",
       "//win8:metro_viewer",
     ]
+    libs += [ "credui.lib" ]
   } else {
     # Non-Windows.
     sources +=

chrome/browser/ui/BUILD.gn

@@ -359,6 +359,7 @@ static_library("ui") {
   if (is_win) {
     sources +=
         rebase_path(gypi_values.chrome_browser_ui_win_sources, ".", "//chrome")
+    sources -= [ "views/frame/taskbar_decorator.cc" ]
     public_deps += [
       "//ui/views",
       "//ui/views/controls/webview",

chrome/test/BUILD.gn

@@ -284,7 +284,7 @@ if (!is_android) {
         # SendMouseMoveNotifyWhenDone
         sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ]
       }
-      if (is_chromeos) {
+      if (is_chromeos || !use_x11) {
         sources -= [
           "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc",
           "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc",
@@ -367,14 +367,7 @@ if (!is_android) {
       sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources,
                              ".",
                              "//chrome")
-      sources += [
-        # TODO: It would be nice to have these pulled in automatically from
-        # direct_dependent_settings in their various targets
-        # (net.gyp:net_resources, etc.), but that causes errors in other
-        # targets when resulting .res files get referenced multiple times.
-        "$root_gen_dir/chrome/other_version.rc",
-        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
-      ]
+      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/isimpledom",
@@ -838,10 +831,7 @@ if (!is_android) {
       ]
     }
     if (is_win) {
-      sources += [
-        "$root_gen_dir/chrome/other_version.rc",
-        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
-      ]
+      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/wtl",
@@ -1070,10 +1060,7 @@ if (!is_android) {
       ldflags = [ "-Wl,-ObjC" ]
     }
     if (is_win) {
-      sources += [
-        "$root_gen_dir/chrome/other_version.rc",
-        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
-      ]
+      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/wtl",
@@ -1136,10 +1123,7 @@ if (!is_android) {
       ldflags = [ "-Wl,-ObjC" ]
     }
     if (is_win) {
-      sources += [
-        "$root_gen_dir/chrome/other_version.rc",
-        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
-      ]
+      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/wtl",

components/BUILD.gn

@@ -271,4 +271,7 @@ test("components_unittests") {
     # TODO(GYP) enable this as above.
     #deps += [ "//components/constrained_window:unit_tests" ]
   }
+  if (is_win) {
+    deps += [ "//components/browser_watcher:unit_tests" ]
+  }
 }

components/browser_watcher/BUILD.gn

@@ -40,6 +40,8 @@ source_set("unit_tests") {
     "watcher_metrics_provider_win_unittest.cc",
   ]
   deps = [
+    ":browser_watcher",
+    ":browser_watcher_client",
     "//testing/gtest",
   ]
 }

components/invalidation/BUILD.gn

@@ -108,9 +108,8 @@ static_library("invalidation") {
   }
 }
 
-static_library("unittests") {
+group("unittests") {
   testonly = true
-  sources = []
   deps = [
     ":invalidation",
     ":test_support",

content/shell/BUILD.gn

@@ -278,6 +278,10 @@ static_library("content_shell_lib") {
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]
+    sources += [
+      "common/v8_breakpad_support_win.cc",
+      "common/v8_breakpad_support_win.h",
+    ]
   }
 
   if (is_linux) {
@@ -487,7 +491,6 @@ if (!is_android && !is_mac) {
     #  - RC file.
     #  - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
     sources = [
-      "../app/startup_helper_win.cc",
       "app/shell_main.cc",
     ]
 

content/test/BUILD.gn

@@ -56,6 +56,7 @@ static_library("test_support") {
       "//content/browser/speech/proto",
       "//content/public/child:child_sources",
       "//content/gpu",
+      "//content/public/plugin:plugin_sources",
       "//content/public/renderer:renderer_sources",
       "//content/public/utility:utility_sources",
       "//content/shell:pak",
@@ -125,6 +126,7 @@ static_library("test_support") {
 
     if (is_win) {
       deps += [ "//third_party/iaccessible2" ]
+      sources += [ "../app/startup_helper_win.cc" ]
     }
 
     if (!is_android && !is_ios) {

extensions/BUILD.gn

@@ -59,6 +59,7 @@ grit("extensions_renderer_resources") {
 
   deps = [
     "//device/serial:serial_mojo",
+    "//extensions/common:mojo",
     "//extensions/common/api:mojom",
   ]
 }

extensions/browser/BUILD.gn

@@ -595,7 +595,7 @@ source_set("browser") {
         "api/networking_private/network_config_dbus_constants_linux.h",
       ]
     } else if (is_win || is_mac) {
-      deps += [ "//components/wifi_component" ]
+      deps += [ "//components/wifi" ]
       sources += [
         "api/networking_private/networking_private_event_router_nonchromeos.cc",
         "api/networking_private/networking_private_service_client.cc",

extensions/shell/BUILD.gn

@@ -163,6 +163,11 @@ if (!(is_chromeos && !use_ozone)) {
       ":app_shell_lib",
       "//extensions:shell_and_test_pak",
     ]
+
+    if (is_win) {
+      configs += [ "//build/config/win:windowed" ]
+      configs -= [ "//build/config/win:console" ]
+    }
   }
 }
 

third_party/mojo_services/src/view_manager/public/cpp/lib/view.cc

@@ -387,7 +387,7 @@ namespace {
 ViewportMetricsPtr CreateEmptyViewportMetrics() {
   ViewportMetricsPtr metrics = ViewportMetrics::New();
   metrics->size = Size::New();
-  return metrics;
+  return metrics.Pass();
 }
 }
 

ui/views/BUILD.gn

@@ -68,7 +68,7 @@ component("views") {
     sources += gypi_values.views_win_sources
     cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     libs = [
-      "/imm32.lib",
+      "imm32.lib",
       "oleacc.lib",
     ]
     ldflags = [ "/DELAYLOAD:user32.dll" ]

ui/views/examples/BUILD.gn

@@ -157,4 +157,9 @@ executable("views_examples_with_content_exe") {
     "//content",
     "//ui/views_content_client",
   ]
+
+  if (is_win) {
+    configs += [ "//build/config/win:windowed" ]
+    configs -= [ "//build/config/win:console" ]
+  }
 }