From daa093eea7c773db06799a13bd7e4e2e2a9f8f14 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 20 Nov 2017 15:06:40 +0100
Subject: BASELINE: Update Chromium to 63.0.3239.58

Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 chromium/components/exo/BUILD.gn | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'chromium/components/exo/BUILD.gn')

diff --git a/chromium/components/exo/BUILD.gn b/chromium/components/exo/BUILD.gn
index 41a6440c033..a388c60ffce 100644
--- a/chromium/components/exo/BUILD.gn
+++ b/chromium/components/exo/BUILD.gn
@@ -22,6 +22,7 @@ source_set("exo") {
     "data_source_delegate.h",
     "display.cc",
     "display.h",
+    "gaming_seat.cc",
     "gaming_seat.h",
     "keyboard.cc",
     "keyboard.h",
@@ -64,7 +65,6 @@ source_set("exo") {
     "//ash/public/cpp:ash_public_cpp",
     "//base",
     "//cc",
-    "//cc/ipc:interfaces",
     "//components/viz/service",
     "//device/gamepad",
     "//device/gamepad/public/cpp:shared_with_blink",
@@ -76,24 +76,17 @@ source_set("exo") {
     "//ui/compositor",
     "//ui/display/manager",
     "//ui/events/devices:devices",
+    "//ui/events/ozone:events_ozone_evdev",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
+    "//ui/ozone",
     "//ui/views",
     "//ui/views/mus",
     "//ui/wm",
     "//ui/wm/public",
   ]
 
-  if (enable_exo_ozone_gamepad) {
-    defines = [ "USE_OZONE_GAMEPAD" ]
-    sources += [ "gaming_seat_ozone.cc" ]
-    deps += [ "//ui/ozone" ]
-    deps += [ "//ui/events/ozone:events_ozone_evdev" ]
-  } else {
-    sources += [ "gaming_seat.cc" ]
-  }
-
   if (is_chromeos) {
     deps += [ "//chromeos" ]
   }
@@ -129,9 +122,12 @@ source_set("unit_tests") {
   testonly = true
 
   sources = [
+    "../../ui/events/ozone/gamepad/gamepad_event.cc",
     "buffer_unittest.cc",
+    "data_device_unittest.cc",
     "data_offer_unittest.cc",
     "display_unittest.cc",
+    "gaming_seat_unittest.cc",
     "keyboard_unittest.cc",
     "pointer_unittest.cc",
     "shared_memory_unittest.cc",
@@ -163,6 +159,7 @@ source_set("unit_tests") {
     "//ui/compositor:test_support",
     "//ui/events:dom_keycode_converter",
     "//ui/events:test_support",
+    "//ui/events/ozone:events_ozone_evdev",
     "//ui/gfx",
     "//ui/keyboard",
     "//ui/message_center",
@@ -173,14 +170,6 @@ source_set("unit_tests") {
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
-
-  if (enable_exo_ozone_gamepad) {
-    sources += [
-      "../../ui/events/ozone/gamepad/gamepad_event.cc",
-      "gaming_seat_unittest.cc",
-    ]
-    deps += [ "//ui/events/ozone:events_ozone_evdev" ]
-  }
 }
 
 test("exo_unittests") {
-- 
cgit v1.2.1