Miscellaneous GN updates.

chrome/browser/ui/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
@@ skipping 20 matching lines @@
     # NOTE: New dependencies should generally be added in the OS!="ios"
     # dependencies block below, rather than here.
     "//base/allocator",
     "//chrome:extra_resources",
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/app/resources:platform_locale_settings",
     "//chrome/app/theme:theme_resources",
     "//chrome/browser/history:in_memory_url_index_cache_proto",
     "//chrome/browser/net:cert_logger_proto",
+    "//chrome/browser/ui/views",
     "//chrome/common",
     "//chrome/common/net",
+    "//components/auto_login_parser",
     "//components/dom_distiller/core",
     "//components/dom_distiller/webui",
     "//components/feedback/proto",
+    "//components/invalidation",
+    "//components/omaha_query_params",
     "//components/onc",
+    "//components/password_manager/core/browser",
     "//components/resources",
     "//components/strings",
     "//content/public/browser",
     "//content/public/common",
     "//crypto",
     "//skia",
     "//sync",
     "//third_party/cacheinvalidation",
     "//third_party/icu",
     "//third_party/libusb",
     "//third_party/libxml",
     "//third_party/zlib",
     "//ui/accessibility",
     "//ui/base",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/message_center",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/snapshot",
     "//ui/strings",
-    #'chrome_browser_ui_views.gyp:browser_ui_views',  TODO(GYP)
-    #'../components/components.gyp:auto_login_parser',  TODO(GYP)
-    #'../components/components.gyp:invalidation',  TODO(GYP)
-    #'../components/components.gyp:omaha_query_params',  TODO(GYP)
-    #'../components/components.gyp:password_manager_core_browser',  TODO(GYP)
   ]
 
   forward_dependent_configs_from = [
     "//components/dom_distiller/core",
     "//sync",
   ]
 
   if (!is_ios) {
     sources += rebase_path(gypi_values.chrome_browser_ui_non_ios_sources,
                            ".", "//chrome")
     deps += [
       "//chrome/browser/extensions",
       "//chrome/browser/performance_monitor",
       "//chrome/browser/ui/webui/omnibox:mojo_bindings",
       "//chrome/common/extensions/api:api",
       "//components/autofill/content/browser:risk_proto",
       "//device/bluetooth",
       "//device/nfc",
+      "//media",
       "//mojo/system",
       "//net:net_with_v8",
       "//third_party/adobe/flash:flapper_version_h",
       "//third_party/expat",
       "//third_party/hunspell",
       "//third_party/leveldatabase",
       "//third_party/npapi",
       "//third_party/re2",
       "//ui/compositor",
       "//ui/surface",
+      "//ui/web_dialogs",
       "//v8",
       "//webkit:resources",
       "//webkit/browser:storage",
       "//webkit/common",
       "//webkit/common:storage",
       #'debugger',  TODO(GYP)
       #'installer_util',  TODO(GYP)
-      #'../media/media.gyp:media',  TODO(GYP)
       #'../third_party/libjingle/libjingle.gyp:libjingle',  TODO(GYP)
-      #'../ui/web_dialogs/web_dialogs.gyp:web_dialogs',  TODO(GYP)
     ]
     # TODO(GYP)
     #'defines': [
     #  '<@(nacl_defines)',
     #],
     #'direct_dependent_settings': {
     #  'defines': [
     #    '<@(nacl_defines)',
     #  ],
     #  },
@@ skipping 58 matching lines @@
     sources += rebase_path(gypi_values.chrome_browser_ui_non_chromeos_sources,
                            ".", "//chrome")
   }
   if (use_cups) {
     configs += [ "//printing:cups" ]
   }
   if (use_ash) {
     sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources,
                            ".", "//chrome")
     deps += [
-      "//ash",
-      #"../ash/ash.gyp:ash_with_content",  TODO(GYP)
-      #"../ash/ash_strings.gyp:ash_strings",  TODO(GYP)
+      "//ash:ash_with_content",
     ]
     if (!is_chromeos) {
       sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos,
                              ".", "//chrome")
     }
   } else {  # Not ash.
     sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources,
                            ".", "//chrome")
   }
   if (toolkit_views) {
@@ skipping 24 matching lines @@
   if (is_chromeos || is_android) {
     sources += rebase_path(
         gypi_values.chrome_browser_ui_android_chromeos_sources,
         ".", "//chrome")
   }
   if (use_aura) {
     sources += rebase_path(gypi_values.chrome_browser_ui_aura_sources,
                            ".", "//chrome")
     deps += [
       # aura uses some of ash resources.
-      #'../ash/ash_resources.gyp:ash_resources',  TODO(GYP)
+      "//ash/resources",
       "//ui/aura",
       "//ui/keyboard",
       "//ui/keyboard:resources",
       "//ui/wm",
     ]
     if (!is_chromeos) {
       sources += rebase_path(gypi_values.chrome_browser_ui_aura_non_chromeos,
                              ".", "//chrome")
     }
   } else {  # Non-Aura.
@@ skipping 15 matching lines @@
                            ".", "//chrome")
   }
   if (is_linux || is_android) {
     sources += rebase_path(gypi_values.chrome_browser_ui_android_linux_sources,
                            ".", "//chrome")
   }
 
   if (is_android) {
     deps += [
       "//crypto:platform",
-      #'../components/components.gyp:web_conten  TODO(GYP)ts_delegate_android',
+      #'../components/components.gyp:web_contents_delegate_android',  TODO(GYP)
       #'chrome_browser_jni_headers',  TODO(GYP)
     ]
     deps -= [
+      "//chrome/browser/ui/views",
       "//components/feedback/proto",
       "//third_party/libusb",
       "//ui/events",
-      #'chrome_browser_ui_views.gyp:browser_ui_views',  TODO(GYP)
     ]
     sources += rebase_path(gypi_values.chrome_browser_ui_android_sources,
                            ".", "//chrome")
   } else {  # Non-Android.
     sources += rebase_path(gypi_values.chrome_browser_ui_non_android_sources,
                            ".", "//chrome")
   }
 
   if (is_mac) {
     sources += rebase_path(gypi_values.chrome_browser_ui_mac_sources,
@@ skipping 40 matching lines @@
                            ".", "//chrome")
   }
 
   if (is_win) {
     sources += rebase_path(gypi_values.chrome_browser_ui_win_sources,
                            ".", "//chrome")
     deps += [
       "//third_party/wtl",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",
+      "//ui/app_list",
+      "//ui/views",
+      "//ui/views/controls/webview",
       #'installer_util_strings',  TODO(GYP)
       #'launcher_support',  TODO(GYP)
       #'metro_utils',  TODO(GYP)
       #'../google_update/google_update.gyp:google_update',  TODO(GYP)
-      #'../ui/app_list/app_list.gyp:app_list',  TODO(GYP)
-      #'../ui/views/controls/webview/webview.gyp:webview',  TODO(GYP)
-      #'../ui/views/views.gyp:views',  TODO(GYP)
     ]
     forward_dependent_configs_from += [
-      #'../ui/views/controls/webview/webview.gyp:webview',  TODO(GYP)
-      #'../ui/views/views.gyp:views',  TODO(GYP)
+      "//ui/views",
+      "//ui/views/controls/webview",
     ]
   } else {  # 'OS!="win"
     if (use_aura) {
       deps += [
-        #'../ui/views/controls/webview/webview.gyp:webview',  TODO(GYP)
-        #'../ui/views/views.gyp:views',  TODO(GYP)
+        "//ui/views",
+        "//ui/views/controls/webview",
+      ]
+      forward_dependent_configs_from += [
+        "//ui/views",
+        "//ui/views/controls/webview",
       ]
     }
   }
   if (is_desktop_linux) {
     sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources,
                            ".", "//chrome")
   }
   if (is_linux) {  # Both desktop Linux and ChromeOS.
     sources += rebase_path(gypi_values.chrome_browser_ui_linux_sources,
                            ".", "//chrome")
     configs += [ "//build/config/linux:udev" ]
     if (use_aura) {
       configs += [ "//build/config/linux:fontconfig" ]
       deps += [ "//dbus" ]
     }
     if (use_x11) {
       sources += rebase_path(gypi_values.chrome_browser_ui_x11_sources,
                              ".", "//chrome")
       configs += [ "//build/config/linux:x11" ]
     }
   }
 
   if (enable_app_list) {
     sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources,
                            ".", "//chrome")
-    #deps += [ '../ui/app_list/app_list.gyp:app_list' ]  TODO(GYP)
+    deps += [ "//ui/app_list" ]
   } else {
     sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources,
                            ".", "//chrome")
   }
   if (enable_autofill_dialog) {
     sources += rebase_path(
         gypi_values.chrome_browser_ui_autofill_dialog_sources,
         ".", "//chrome")
     if (!is_android && !is_ios) {
       sources += rebase_path(
@@ skipping 16 matching lines @@
   }
   if (enable_service_discovery) {
     sources += rebase_path(
         gypi_values.chrome_browser_ui_service_discovery_sources,
         ".", "//chrome")
   }
   if (enable_spellcheck) {
     deps += [ "//third_party/hunspell" ]
   }
 }