Add display, message_center, shell_dialogs, webview to GN build.

R=sky@chromium.org

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

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

BUILD.gn

@@ -96,6 +96,7 @@ group("root") {
     "//ui/aura",
     "//ui/accessibility",
     "//ui/base",
+    "//ui/display",
     "//ui/events",
     "//ui/gfx",
     "//ui/gl",
@@ -106,6 +107,7 @@ group("root") {
     "//ui/strings",
     "//ui/surface",
     "//ui/views",
+    "//ui/views/controls/webview",
     "//ui/web_dialogs",
     "//ui/wm",
     "//url",
@@ -175,7 +177,9 @@ group("root") {
       "//ash",
       "//tools/gn",
       "//ui/aura",
+      "//ui/display",
       "//ui/views",
+      "//ui/views/controls/webview",
 
       # Fails on Android for unknown reasons.
       "//third_party/flac",

build/config/features.gni

@@ -70,9 +70,9 @@ use_seccomp_bpf = (is_linux || is_android) &&
 
 enable_webrtc = !is_ios
 
-# Enable notifications everywhere except Android.
+# Enable notifications everywhere except Android/iOS.
 # Android is http://crbug.com/115320
-enable_notifications = !is_android
+enable_notifications = !is_android && !is_ios
 
 # TODO(brettw) this should be moved to net and only dependents get this define.
 disable_ftp_support = is_ios

build/config/linux/BUILD.gn

@@ -97,7 +97,7 @@ config("xext") {
 }
 
 config("xrandr") {
-  libs = [ "xrandr" ]
+  libs = [ "Xrandr" ]
 }
 
 config("xscrnsaver") {
@@ -112,6 +112,10 @@ config("libcap") {
   libs = [ "cap" ]
 }
 
+config("xi") {
+  libs = [ "Xi" ]
+}
+
 config("libresolv") {
   libs = [ "resolv" ]
 }

chrome/browser/BUILD.gn

@@ -86,6 +86,8 @@ static_library("browser") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/message_center",
+    "//ui/shell_dialogs",
     "//ui/strings",
     "//ui/resources",
     # TODO(GYP)
@@ -103,8 +105,6 @@ static_library("browser") {
     #"../components/components.gyp:sync_driver",
     #"../jingle/jingle.gyp:notifier",
     #"../third_party/libjingle/libjingle.gyp:libjingle",
-    #"../ui/message_center/message_center.gyp:message_center",
-    #"../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs",
   ]
 
   forward_dependent_configs_from = [

chrome/browser/ui/BUILD.gn

@@ -61,6 +61,7 @@ static_library("ui") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/message_center",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/snapshot",
@@ -70,7 +71,6 @@ static_library("ui") {
     #'../components/components.gyp:invalidation',  TODO(GYP)
     #'../components/components.gyp:omaha_query_params',  TODO(GYP)
     #'../components/components.gyp:password_manager_core_browser',  TODO(GYP)
-    #'../ui/message_center/message_center.gyp:message_center',  TODO(GYP)
   ]
 
   forward_dependent_configs_from = [

content/common/BUILD.gn

@@ -36,11 +36,11 @@ source_set("common") {
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/shell_dialogs",
     "//url",
     "//third_party/WebKit/public:blink_headers",
     # TODO(GYP) convert these dependencies.
     #'../third_party/libjingle/libjingle.gyp:libjingle',
-    #'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
   ]
 
   if (!is_ios) {

ui/base/ui_base.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //ui/base
       'target_name': 'ui_base',
       'type': '<(component)',
       'dependencies': [
@@ -35,6 +36,7 @@
         '../gfx/gfx.gyp:gfx',
       ],
       'sources' : [
+        # Note: file list duplicated in GN build.
         'accelerators/accelerator.cc',
         'accelerators/accelerator.h',
         'accelerators/accelerator_manager.cc',
@@ -580,6 +582,7 @@
       ],
     },
     {
+      # GN version: //ui/base:test_support
       'target_name': 'ui_base_test_support',
       'dependencies': [
         '../../base/base.gyp:base',
@@ -589,6 +592,7 @@
         '../gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'test/ui_controls.h',
         'test/ui_controls_aura.cc',
         'test/ui_controls_internal_win.cc',
@@ -624,9 +628,11 @@
     ['OS=="android"' , {
        'targets': [
          {
+           # GN version: //ui/base:ui_base_jni_headers
            'target_name': 'ui_base_jni_headers',
            'type': 'none',
            'sources': [
+             # Note: file list duplicated in GN build.
              '../android/java/src/org/chromium/ui/base/Clipboard.java',
              '../android/java/src/org/chromium/ui/base/DeviceFormFactor.java',
              '../android/java/src/org/chromium/ui/base/LocalizationUtils.java',

ui/display/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/ui.gni")
+
+component("display") {
+  sources = [
+    "chromeos/display_configurator.cc",
+    "chromeos/display_configurator.h",
+    "chromeos/touchscreen_delegate_impl.cc",
+    "chromeos/touchscreen_delegate_impl.h",
+    "chromeos/ozone/display_configurator_ozone.cc",
+    "chromeos/x11/display_configurator_x11.cc",
+    "chromeos/x11/display_mode_x11.cc",
+    "chromeos/x11/display_mode_x11.h",
+    "chromeos/x11/display_snapshot_x11.cc",
+    "chromeos/x11/display_snapshot_x11.h",
+    "chromeos/x11/display_util_x11.cc",
+    "chromeos/x11/display_util_x11.h",
+    "chromeos/x11/native_display_delegate_x11.cc",
+    "chromeos/x11/native_display_delegate_x11.h",
+    "chromeos/x11/native_display_event_dispatcher_x11.cc",
+    "chromeos/x11/native_display_event_dispatcher_x11.h",
+    "chromeos/x11/touchscreen_device_manager_x11.cc",
+    "chromeos/x11/touchscreen_device_manager_x11.h",
+    "display_export.h",
+    "display_switches.cc",
+    "display_switches.h",
+  ]
+
+  defines = [ "DISPLAY_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//ui/display/util",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+
+  if (use_x11) {
+    configs += [
+      "//build/config/linux:x11",
+      "//build/config/linux:xext",
+      "//build/config/linux:xi",
+      "//build/config/linux:xrandr",
+    ]
+    deps += [
+      "//ui/events/platform",
+    ]
+  }
+
+  if (is_chromeos) {
+    deps += [ "//ui/display/types" ]
+  }
+
+  if (use_ozone) {
+    deps += [ "//ui/ozone" ]
+  }
+}
+
+component("test_util") {
+  output_name = "display_test_util"
+  sources = [
+    "chromeos/test/test_display_snapshot.cc",
+    "chromeos/test/test_display_snapshot.h",
+  ]
+
+  defines = [ "DISPLAY_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+
+  if (is_chromeos) {
+    deps += [ "//ui/display/types" ]
+  }
+}
+
+test("display_unittests") {
+  sources = [
+    "chromeos/display_configurator_unittest.cc",
+    "chromeos/touchscreen_delegate_impl_unittest.cc",
+    "chromeos/x11/display_util_x11_unittest.cc",
+    "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
+    "util/display_util_unittest.cc",
+    "util/edid_parser_unittest.cc",
+  ]
+
+  deps = [
+    "//base/test:run_all_unittests",
+    "//testing/gtest",
+    "//ui/display/util",
+    "//ui/gfx/geometry",
+  ]
+
+  if (is_chromeos) {
+    deps += [
+      ":display",
+      ":test_util",
+      "//ui/display/types",
+    ]
+  }
+}

ui/display/display.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //ui/display/types
       'target_name': 'display_types',
       'type': '<(component)',
       'dependencies': [
@@ -18,6 +19,7 @@
         'DISPLAY_TYPES_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'types/chromeos/display_mode.cc',
         'types/chromeos/display_mode.h',
         'types/chromeos/display_snapshot.cc',
@@ -32,6 +34,7 @@
       ],
     },
     {
+      # GN version: //ui/display
       'target_name': 'display',
       'type': '<(component)',
       'dependencies': [
@@ -44,6 +47,7 @@
         'DISPLAY_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'chromeos/display_configurator.cc',
         'chromeos/display_configurator.h',
         'chromeos/touchscreen_delegate_impl.cc',
@@ -89,6 +93,7 @@
       ],
     },
     {
+      # GN version: //ui/display/util
       'target_name': 'display_util',
       'type': '<(component)',
       'dependencies': [
@@ -99,6 +104,7 @@
         'DISPLAY_UTIL_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list shared with GN build.
         'util/display_util.cc',
         'util/display_util.h',
         'util/display_util_export.h',
@@ -122,6 +128,7 @@
       ],
     },
     {
+      # GN version: //ui/display:test_util
       'target_name': 'display_test_util',
       'type': '<(component)',
       'dependencies': [
@@ -133,6 +140,7 @@
         'DISPLAY_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'chromeos/test/test_display_snapshot.cc',
         'chromeos/test/test_display_snapshot.h',
       ],
@@ -145,6 +153,7 @@
       ],
     },
     {
+      # GN version: //ui/display:display_unittests
       'target_name': 'display_unittests',
       'type': 'executable',
       'dependencies': [

ui/display/types/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.
+
+component("types") {
+  output_name = "display_types"
+  sources = [
+    "chromeos/display_mode.cc",
+    "chromeos/display_mode.h",
+    "chromeos/display_snapshot.cc",
+    "chromeos/display_snapshot.h",
+    "chromeos/native_display_delegate.h",
+    "chromeos/native_display_observer.h",
+    "chromeos/touchscreen_device.cc",
+    "chromeos/touchscreen_device.h",
+    "chromeos/touchscreen_device_manager.h",
+    "display_constants.h",
+    "display_types_export.h",
+  ]
+
+  defines = [ "DISPLAY_TYPES_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//ui/gfx/geometry",
+  ]
+}

ui/display/util/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/ui.gni")
+
+component("util") {
+  output_name = "display_util"
+  sources = [
+    "display_util.cc",
+    "display_util.h",
+    "display_util_export.h",
+    "edid_parser.cc",
+    "edid_parser.h",
+  ]
+
+  defines = [ "DISPLAY_UTIL_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//ui/gfx/geometry",
+  ]
+
+  if (use_x11) {
+    sources += [
+      "x11/edid_parser_x11.cc",
+      "x11/edid_parser_x11.h",
+    ]
+    configs += [ "//build/config/linux:xrandr" ]
+    deps += [ "//ui/gfx/x" ]
+  }
+  if (is_chromeos) {
+    deps += [ "//ui/display/types" ]
+  }
+}

ui/message_center/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")
+
+component("message_center") {
+  defines = [ "MESSAGE_CENTER_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//skia",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/resources",
+    "//ui/strings",
+  ]
+
+  if (enable_notifications) {
+    sources = [
+      "cocoa/notification_controller.h",
+      "cocoa/notification_controller.mm",
+      "cocoa/opaque_views.h",
+      "cocoa/opaque_views.mm",
+      "cocoa/popup_collection.h",
+      "cocoa/popup_collection.mm",
+      "cocoa/popup_controller.h",
+      "cocoa/popup_controller.mm",
+      "cocoa/settings_controller.h",
+      "cocoa/settings_controller.mm",
+      "cocoa/settings_entry_view.h",
+      "cocoa/settings_entry_view.mm",
+      "cocoa/status_item_view.h",
+      "cocoa/status_item_view.mm",
+      "cocoa/tray_controller.h",
+      "cocoa/tray_controller.mm",
+      "cocoa/tray_view_controller.h",
+      "cocoa/tray_view_controller.mm",
+      "message_center.cc",
+      "message_center.h",
+      "message_center_export.h",
+      "notification_delegate.cc",
+      "notification_delegate.h",
+      "message_center_impl.cc",
+      "message_center_impl.h",
+      "message_center_observer.h",
+      "message_center_style.cc",
+      "message_center_style.h",
+      "message_center_tray.cc",
+      "message_center_tray.h",
+      "message_center_tray_delegate.h",
+      "message_center_types.h",
+      "notification.cc",
+      "notification.h",
+      "notification_blocker.cc",
+      "notification_blocker.h",
+      "notification_list.cc",
+      "notification_list.h",
+      "notification_types.cc",
+      "notification_types.h",
+      "notifier_settings.cc",
+      "notifier_settings.h",
+    ]
+
+    if (is_win) {
+      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+      cflags = [ "/wd4267" ]
+      deps += [ "//ui/aura" ]
+    }
+
+    if (toolkit_views) {
+      sources += [
+        "views/bounded_label.cc",
+        "views/bounded_label.h",
+        "views/constants.h",
+        "views/desktop_popup_alignment_delegate.cc",
+        "views/desktop_popup_alignment_delegate.h",
+        "views/message_center_controller.h",
+        "views/message_center_button_bar.cc",
+        "views/message_center_button_bar.h",
+        "views/message_center_view.cc",
+        "views/message_center_view.h",
+        "views/message_popup_collection.cc",
+        "views/message_popup_collection.h",
+        "views/message_view.cc",
+        "views/message_view.h",
+        "views/message_view_context_menu_controller.cc",
+        "views/message_view_context_menu_controller.h",
+        "views/notifier_settings_view.cc",
+        "views/notifier_settings_view.h",
+        "views/notification_button.cc",
+        "views/notification_button.h",
+        "views/notification_view.cc",
+        "views/notification_view.h",
+        "views/padded_button.cc",
+        "views/padded_button.h",
+        "views/popup_alignment_delegate.cc",
+        "views/popup_alignment_delegate.h",
+        "views/proportional_image_view.cc",
+        "views/proportional_image_view.h",
+        "views/toast_contents_view.cc",
+        "views/toast_contents_view.h",
+      ]
+      deps += [
+        "//ui/events",
+        "//ui/views",
+        "//ui/compositor",
+      ]
+    }
+
+    if (use_ash) {
+      sources += [
+        "views/message_bubble_base.cc",
+        "views/message_bubble_base.h",
+        "views/message_center_bubble.cc",
+        "views/message_center_bubble.h",
+      ]
+    }
+
+  } else {
+    # Notification service disabled.
+    sources = [
+      "dummy_message_center.cc",
+      "notification_delegate.cc",
+      "notification_delegate.h",
+    ]
+    # Android implements its own notification UI manager instead of deferring to
+    # the message center (when notifications are enabled). Include a minimal
+    # set of files required for notifications on Android.
+    if (is_android) {
+      sources += [
+        "notification.cc",
+        "notification.h",
+        "notifier_settings.cc",
+        "notifier_settings.h",
+      ]
+    }
+  }
+}
+
+static_library("test_support") {
+  sources = [
+    "fake_message_center.h",
+    "fake_message_center.cc",
+    "fake_message_center_tray_delegate.h",
+    "fake_message_center_tray_delegate.cc",
+    "fake_notifier_settings_provider.h",
+    "fake_notifier_settings_provider.cc",
+  ]
+
+  deps = [
+    ":message_center",
+    "//base",
+    "//base/test:test_support",
+    "//skia",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+}
+
+# TODO(GYP) Enable this when media is linked.
+if (false) {
+
+test("message_center_unittests") {
+  sources = [
+    "test/run_all_unittests.cc",
+  ]
+
+  deps = [
+    ":message_center",
+    ":test_support",
+    "//base",
+    "//base/allocator",
+    "//base/test:test_support",
+    "//skia",
+    "//testing/gtest",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/resources",
+    "//ui/resources:ui_test_pak",
+    "//url",
+  ]
+
+  if (enable_notifications) {
+    sources += [
+      "cocoa/notification_controller_unittest.mm",
+      "cocoa/popup_collection_unittest.mm",
+      "cocoa/popup_controller_unittest.mm",
+      "cocoa/settings_controller_unittest.mm",
+      "cocoa/status_item_view_unittest.mm",
+      "cocoa/tray_controller_unittest.mm",
+      "cocoa/tray_view_controller_unittest.mm",
+      "message_center_tray_unittest.cc",
+      "message_center_impl_unittest.cc",
+      "notification_delegate_unittest.cc",
+      "notification_list_unittest.cc",
+    ]
+
+    if (is_mac) {
+      deps += [ "//ui/gfx:test_support" ]
+    }
+
+    if (toolkit_views) {
+      sources += [
+        "views/bounded_label_unittest.cc",
+        "views/message_center_view_unittest.cc",
+        "views/message_popup_collection_unittest.cc",
+        "views/notification_view_unittest.cc",
+        "views/notifier_settings_view_unittest.cc",
+      ]
+      deps += [
+        # Compositor is needed by message_center_view_unittest.cc and for the
+        # fonts used by bounded_label_unittest.cc.
+        "//ui/compositor",
+        "//ui/views",
+        "//ui/views:test_support",
+      ]
+    }
+  }  # enable_notifications
+}
+
+}  # if false

ui/message_center/message_center.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //ui/message_center
       'target_name': 'message_center',
       'type': '<(component)',
       'dependencies': [
@@ -26,6 +27,7 @@
         'MESSAGE_CENTER_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'cocoa/notification_controller.h',
         'cocoa/notification_controller.mm',
         'cocoa/opaque_views.h',
@@ -132,8 +134,6 @@
             'views/message_bubble_base.h',
             'views/message_center_bubble.cc',
             'views/message_center_bubble.h',
-            'views/message_popup_bubble.cc',
-            'views/message_popup_bubble.h',
           ],
         }],
         # iOS disables notifications altogether, Android implements its own
@@ -143,7 +143,6 @@
             # Exclude everything except dummy impl.
             ['exclude', '\\.(cc|mm)$'],
             ['include', '^dummy_message_center\\.cc$'],
-            ['include', '^message_center_switches\\.cc$'],
             ['include', '^notification_delegate\\.cc$'],
           ],
         }, {  # notifications==1
@@ -159,6 +158,7 @@
       ],
     },  # target_name: message_center
     {
+      # GN version: //ui/message_center:test_support
       'target_name': 'message_center_test_support',
       'type': 'static_library',
       'dependencies': [
@@ -171,6 +171,7 @@
         'message_center',
       ],
       'sources': [
+        # Note: sources list duplicated in GN build.
         'fake_message_center.h',
         'fake_message_center.cc',
         'fake_message_center_tray_delegate.h',
@@ -180,6 +181,7 @@
       ],
     },  # target_name: message_center_test_support
     {
+      # GN version: //ui/message_center:message_center_unittests
       'target_name': 'message_center_unittests',
       'type': 'executable',
       'dependencies': [
@@ -197,6 +199,7 @@
         'message_center_test_support',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'cocoa/notification_controller_unittest.mm',
         'cocoa/popup_collection_unittest.mm',
         'cocoa/popup_controller_unittest.mm',

ui/ozone/BUILD.gn

@@ -84,9 +84,7 @@ component("ozone") {
   ]
 
   if (is_chromeos) {
-    deps += [
-      #'<(DEPTH)/ui/display/display.gyp:display_types',  TODO(GYP)
-    ]
+    deps += [ "//ui/dusplay/types" ]
   }
 }
 

ui/shell_dialogs/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/ui.gni")
+if (is_android) {
+  import("//build/config/android/config.gni")
+}
+
+component("shell_dialogs") {
+  sources = [
+    "android/shell_dialogs_jni_registrar.cc",
+    "android/shell_dialogs_jni_registrar.h",
+    "base_shell_dialog.cc",
+    "base_shell_dialog.h",
+    "base_shell_dialog_win.cc",
+    "base_shell_dialog_win.h",
+    "linux_shell_dialog.cc",
+    "linux_shell_dialog.h",
+    "select_file_dialog.cc",
+    "select_file_dialog.h",
+    "select_file_dialog_android.cc",
+    "select_file_dialog_android.h",
+    "select_file_dialog_factory.cc",
+    "select_file_dialog_factory.h",
+    "select_file_dialog_mac.h",
+    "select_file_dialog_mac.mm",
+    "select_file_dialog_win.cc",
+    "select_file_dialog_win.h",
+    "select_file_policy.cc",
+    "select_file_policy.h",
+    "selected_file_info.cc",
+    "selected_file_info.h",
+  ]
+
+  defines = [ "SHELL_DIALOGS_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//skia",
+    "//ui/base",
+    "//ui/strings",
+  ]
+
+  if (use_aura) {
+    if (is_mac) {
+      # Will be automatically filtered out on non-Mac.
+      sources -= [ "select_file_dialog_mac.mm" ]
+    }
+    deps += [ "//ui/aura" ]
+  }
+
+  if (is_android) {
+    deps += [ "//ui/base:ui_base_jni_headers" ]
+    include_dirs = [ "$root_gen_dir/ui" ]
+    libs = [ "jnigraphics" ]
+
+    if (!is_android_webview_build) {
+      #deps += [ '../android/ui_android.gyp:ui_java' ]  TODO(GYP)
+    }
+  }
+
+  if (is_win) {
+    #deps += [ '../../win8/win8.gyp:metro_viewer' ]  TODO(GYP)
+  }
+}
+
+# TODO(GYP) enable shell_dialogs_unittests when media is converted.
+if (false) {
+
+test("shell_dialogs_unittests") {
+  sources = [
+    "select_file_dialog_win_unittest.cc",
+  ]
+
+  deps = [
+    ":shell_dialogs",
+    "//base",
+    "//base/test:test_support",
+    "//base/test:run_all_unittests",
+    "//testing/gtest",
+  ]
+}
+
+}  # if false

ui/shell_dialogs/shell_dialogs.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //ui/shell_dialogs
       'target_name': 'shell_dialogs',
       'type': '<(component)',
       'dependencies': [
@@ -21,6 +22,7 @@
         'SHELL_DIALOGS_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'android/shell_dialogs_jni_registrar.cc',
         'android/shell_dialogs_jni_registrar.h',
         'base_shell_dialog.cc',
@@ -50,8 +52,8 @@
             'dependencies': [
               '../aura/aura.gyp:aura',
             ],
-            'sources/': [
-              ['exclude', 'select_file_dialog_mac.mm'],
+            'sources!': [
+              'select_file_dialog_mac.mm',
             ],
           }
         ],
@@ -87,6 +89,7 @@
       ],
     },  # target_name: shell_dialogs
     {
+      # GN version: //ui/shell_dialogs:shell_dialogs_unittests
       'target_name': 'shell_dialogs_unittests',
       'type': 'executable',
       'dependencies': [
@@ -97,6 +100,7 @@
         'shell_dialogs',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'select_file_dialog_win_unittest.cc',
       ],
     },

ui/views/BUILD.gn

@@ -49,11 +49,11 @@ component("views") {
     ]
   }
   if (use_x11 && !is_chromeos) {
-    #deps += [ '../display/display.gyp:display_util' ]  TODO(GYP)
+    deps += [ "//ui/display/util" ]
   }
   if (is_linux && !is_chromeos) {
     sources -= [ "window/window_button_order_provider.cc" ]
-    #deps += [ '../shell_dialogs/shell_dialogs.gyp:shell_dialogs' ]  TODO(GYP)
+    deps += [ "//ui/shell_dialogs" ]
   } else {
     sources -= [
       "linux_ui/linux_ui.h",

ui/views/controls/webview/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.
+
+component("webview") {
+  sources = [
+    "unhandled_keyboard_event_handler.cc",
+    "unhandled_keyboard_event_handler.h",
+    "unhandled_keyboard_event_handler_linux.cc",
+    "unhandled_keyboard_event_handler_win.cc",
+    "web_dialog_view.cc",
+    "web_dialog_view.h",
+    "webview.cc",
+    "webview.h",
+    "webview_export.h",
+  ]
+
+  defines = [ "WEBVIEW_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//base/third_party/dynamic_annotations",
+    "//content/public/browser",
+    "//skia",
+    "//ui/base",
+    "//ui/events",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/web_dialogs",
+    "//ui/views",
+    "//url",
+  ]
+
+  forward_dependent_configs_from = [
+    "//ui/views",
+  ]
+}

ui/views/controls/webview/webview.gyp

@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //ui/views/controls/webview
       'target_name': 'webview',
       'type': '<(component)',
       'dependencies': [
@@ -28,6 +29,7 @@
         'WEBVIEW_IMPLEMENTATION',
       ],
       'sources': [
+        # Note: file list duplicated in GN build.
         'unhandled_keyboard_event_handler.cc',
         'unhandled_keyboard_event_handler.h',
         'unhandled_keyboard_event_handler_linux.cc',