chromeos: removes more dead mojoms/code

The mojoms TouchDeviceServer, NativeDisplayDelegate and AccessibilityManager are all not needed. Additionally TouchTransformSetterMus is not used. BUG=none TEST=none Change-Id: I8d42aac5d548e5a109289133baeb3dd7fa3dd26b Reviewed-on: https://chromium-review.googlesource.com/1185969 Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: kylechar <kylechar@chromium.org> Commit-Queue: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#585567}
qweri0p · Aug 23, 2018 · b306277 · b306277
1 parent 2202e13
commit b306277
Show file tree

Hide file tree

Showing 18 changed files with 2 additions and 489 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -1056,8 +1056,6 @@ component("ash") {
     "touch/touch_devices_controller.cc",
     "touch/touch_devices_controller.h",
     "touch/touch_observer_hud.cc",
-    "touch/touch_transform_setter_mus.cc",
-    "touch/touch_transform_setter_mus.h",
     "touch/touch_uma.cc",
     "touch/touch_uma.h",
     "tray_action/tray_action.cc",

diff --git a/ash/touch/touch_transform_setter_mus.cc b/ash/touch/touch_transform_setter_mus.cc
diff --git a/ash/touch/touch_transform_setter_mus.h b/ash/touch/touch_transform_setter_mus.h
diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc
@@ -41,7 +41,6 @@
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
-#include "services/ui/public/interfaces/accessibility_manager.mojom.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/events/event_sink.h"

diff --git a/mojo/public/cpp/bindings/sync_call_restrictions.h b/mojo/public/cpp/bindings/sync_call_restrictions.h
@@ -25,10 +25,6 @@ namespace content {
 class BlinkTestController;
 }
 
-namespace display {
-class ForwardingDisplayDelegate;
-}
-
 namespace leveldb {
 class LevelDBMojoProxy;
 }
@@ -107,13 +103,6 @@ class MOJO_CPP_BINDINGS_EXPORT SyncCallRestrictions {
   friend class ui::HostContextFactoryPrivate;
   // END ALLOWED USAGE.
 
-  // BEGIN USAGE THAT NEEDS TO BE FIXED.
-  // In ash::Shell::Init() it assumes that NativeDisplayDelegate will be
-  // synchronous at first. In mushrome ForwardingDisplayDelegate uses a
-  // synchronous call to get the display snapshots as a workaround.
-  friend class display::ForwardingDisplayDelegate;
-  // END USAGE THAT NEEDS TO BE FIXED.
-
 #if ENABLE_SYNC_CALL_RESTRICTIONS
   static void IncreaseScopedAllowCount();
   static void DecreaseScopedAllowCount();

diff --git a/services/ui/input_devices/BUILD.gn b/services/ui/input_devices/BUILD.gn
@@ -19,14 +19,6 @@ source_set("input_devices") {
   public_deps = [
     "//services/ui/public/interfaces/input_devices",
   ]
-
-  if (is_chromeos) {
-    sources += [
-      "touch_device_server.cc",
-      "touch_device_server.h",
-    ]
-    deps += [ "//ui/display/manager" ]
-  }
 }
 
 source_set("tests") {

diff --git a/services/ui/input_devices/touch_device_server.cc b/services/ui/input_devices/touch_device_server.cc
diff --git a/services/ui/input_devices/touch_device_server.h b/services/ui/input_devices/touch_device_server.h
diff --git a/services/ui/manifest.json b/services/ui/manifest.json
@@ -46,17 +46,13 @@
           "ui.mojom.EventInjector",
           "ui.mojom.RemotingEventInjector"
         ],
-        // TODO(sky): update this to reflect what is really possible.
         "window_manager": [
           "discardable_memory.mojom.DiscardableSharedMemoryManager",
-          "display.mojom.NativeDisplayDelegate",
-          "ui.mojom.AccessibilityManager",
           "ui.mojom.EventInjector",
           "ui.mojom.Gpu",
           "ui.mojom.IMEDriver",
           "ui.mojom.InputDeviceController",
           "ui.mojom.InputDeviceServer",
-          "ui.mojom.TouchDeviceServer",
           "ui.mojom.UserActivityMonitor"
         ]
       },

diff --git a/services/ui/public/interfaces/BUILD.gn b/services/ui/public/interfaces/BUILD.gn
@@ -7,7 +7,6 @@ import("//testing/test.gni")
 
 mojom("interfaces") {
   sources = [
-    "accessibility_manager.mojom",
     "event_injector.mojom",
     "gpu.mojom",
     "remoting_event_injector.mojom",

diff --git a/services/ui/public/interfaces/accessibility_manager.mojom b/services/ui/public/interfaces/accessibility_manager.mojom
diff --git a/services/ui/public/interfaces/input_devices/BUILD.gn b/services/ui/public/interfaces/input_devices/BUILD.gn
@@ -15,11 +15,7 @@ mojom("input_devices") {
   ]
 
   if (is_chromeos) {
-    sources += [ "touch_device_server.mojom" ]
-    public_deps += [ "//ui/events/devices/mojo" ]
-    if (use_ozone) {
-      sources += [ "input_device_controller.mojom" ]
-      public_deps += [ "//mojo/public/mojom/base" ]
-    }
+    sources += [ "input_device_controller.mojom" ]
+    public_deps += [ "//mojo/public/mojom/base" ]
   }
 }
diff --git a/services/ui/public/interfaces/input_devices/touch_device_server.mojom b/services/ui/public/interfaces/input_devices/touch_device_server.mojom
diff --git a/ui/display/manager/BUILD.gn b/ui/display/manager/BUILD.gn
@@ -19,8 +19,6 @@ jumbo_component("manager") {
     "fake_display_delegate.h",
     "fake_display_snapshot.cc",
     "fake_display_snapshot.h",
-    "forwarding_display_delegate.cc",
-    "forwarding_display_delegate.h",
     "json_converter.cc",
     "json_converter.h",
     "managed_display_info.cc",