chromeos: removes dependencies on services/ws from ash

There was still some random code in ash depending on services/ws.
This removes most of it (some constants are still used and need to
be moved out of mojoms).

BUG=960503
TEST=none

Change-Id: I32dcc593bd1f680fc39fbbee45840b08903bfa29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1615642Reviewed-by: Jun Mukai <mukai@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660601}

ash/BUILD.gn

@@ -1214,8 +1214,6 @@ component("ash") {
     "wm/toplevel_window_event_handler.h",
     "wm/video_detector.cc",
     "wm/video_detector.h",
-    "wm/widget_finder.cc",
-    "wm/widget_finder.h",
     "wm/window_animations.cc",
     "wm/window_animations.h",
     "wm/window_cycle_controller.cc",
@@ -1289,8 +1287,6 @@ component("ash") {
     "//services/device/public/mojom",
     "//services/media_session/public/mojom",
     "//services/service_manager/public/cpp",
-    "//services/ws:host",
-    "//services/ws:lib",
     "//services/ws/common",
     "//services/ws/public/cpp",
     "//services/ws/public/cpp/input_devices",
@@ -1385,11 +1381,8 @@ component("ash") {
     "//services/data_decoder/public/cpp",
     "//services/preferences/public/cpp",
     "//services/service_manager/public/cpp",
-    "//services/ws/gpu_host",
-    "//services/ws/public/cpp/host",
     "//services/ws/public/cpp/input_devices:input_device_controller",
     "//services/ws/public/mojom/input_devices",
-    "//services/ws/remote_view_host",
 
     # TODO(msw): Remove this; ash should not depend on blink/webkit.
     "//third_party/blink/public:blink_headers",
@@ -1548,11 +1541,6 @@ static_library("ash_shell_lib_with_content") {
     "//device/bluetooth",
     "//net",
     "//services/device/public/mojom",
-    "//services/ws:lib",
-    "//services/ws/ime/test_ime_driver:lib",
-    "//services/ws/ime/test_ime_driver/public/cpp:manifest",
-    "//services/ws/ime/test_ime_driver/public/mojom",
-    "//services/ws/remote_view_host",
     "//skia",
     "//ui/aura",
     "//ui/base",
@@ -1966,7 +1954,6 @@ test("ash_unittests") {
     "//services/media_session/public/cpp/test:test_support",
     "//services/media_session/public/mojom",
     "//services/viz/public/cpp:manifest",
-    "//services/ws:test_support",
     "//services/ws/public/cpp/input_devices:test_support",
     "//services/ws/public/mojom",
     "//skia",
@@ -2233,9 +2220,7 @@ static_library("test_support") {
     "//components/viz/test:test_support",
     "//device/bluetooth",
     "//services/device/public/mojom",
-    "//services/ws:test_support",
     "//services/ws/public/cpp",
-    "//services/ws/public/cpp/host",
     "//services/ws/public/cpp/input_devices",
     "//services/ws/public/cpp/input_devices:test_support",
     "//services/ws/public/mojom",

ash/accelerators/debug_commands.cc

@@ -13,7 +13,6 @@
 #include "ash/touch/touch_devices_controller.h"
 #include "ash/wallpaper/wallpaper_controller.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
-#include "ash/wm/widget_finder.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
@@ -52,7 +51,7 @@ void HandlePrintViewHierarchy() {
   aura::Window* active_window = wm::GetActiveWindow();
   if (!active_window)
     return;
-  views::Widget* widget = GetInternalWidgetForWindow(active_window);
+  views::Widget* widget = views::Widget::GetWidgetForNativeView(active_window);
   if (!widget)
     return;
   views::PrintViewHierarchy(widget->GetRootView());

ash/app_list/BUILD.gn

@@ -118,9 +118,6 @@ component("app_list") {
     "//components/sync",
     "//mojo/public/cpp/bindings",
     "//services/content/public/cpp",
-    "//services/ws/public/cpp",
-    "//services/ws/public/mojom",
-    "//services/ws/remote_view_host",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
@@ -138,6 +135,7 @@ component("app_list") {
     "//ui/strings",
     "//ui/views",
     "//ui/wm",
+    "//ui/wm/public",
   ]
 
   # TODO(hejq): Remove this once app_list is migrated. http://crbug.com/733662

ash/app_list/DEPS

@@ -9,7 +9,6 @@ include_rules = [
   "+components/sync",
   "+mojo/public/cpp",
   "+net/http/http_response_headers.h",
-  "+services/ws/public",
   "+skia",
   "+third_party/google_toolbox_for_mac/src",
   "+third_party/skia",

ash/components/fast_ink/BUILD.gn

@@ -19,7 +19,6 @@ source_set("fast_ink") {
     "//gpu",
     "//gpu/command_buffer/client",
     "//gpu/command_buffer/common",
-    "//services/ws/public/mojom",
     "//skia",
     "//ui/aura",
     "//ui/gfx",

ash/focus_cycler.cc

@@ -6,7 +6,6 @@
 
 #include "ash/shell.h"
 #include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/widget_finder.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ui/views/accessible_pane_view.h"
@@ -42,7 +41,7 @@ void FocusCycler::RemoveWidget(views::Widget* widget) {
 void FocusCycler::RotateFocus(Direction direction) {
   aura::Window* window = wm::GetActiveWindow();
   if (window) {
-    views::Widget* widget = GetInternalWidgetForWindow(window);
+    views::Widget* widget = views::Widget::GetWidgetForNativeView(window);
     // First try to rotate focus within the active widget. If that succeeds,
     // we're done.
     if (widget &&
@@ -87,7 +86,7 @@ void FocusCycler::RotateFocus(Direction direction) {
         break;
       auto* window = mru_windows.front();
       wm::GetWindowState(window)->Activate();
-      views::Widget* widget = GetInternalWidgetForWindow(window);
+      views::Widget* widget = views::Widget::GetWidgetForNativeView(window);
       if (!widget)
         break;
       views::FocusManager* focus_manager = widget->GetFocusManager();

ash/shell/content/client/DEPS

@@ -6,5 +6,4 @@ include_rules = [
   "+content/shell",
   "+storage/browser/quota",
   "+services/device/public",
-  "+services/ws/ime/test_ime_driver",
 ]

ash/shell/content/client/shell_browser_main_parts.cc

@@ -37,8 +37,6 @@
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "net/base/net_module.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
-#include "services/ws/public/mojom/constants.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ -120,9 +118,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 
-  // TODO(https://crbug.com/904148): This should not use |WarmService()|.
-  connector->WarmService(service_manager::ServiceFilter::ByName(
-      test_ime_driver::mojom::kServiceName));
   ash::Shell::Get()->InitWaylandServer(nullptr);
 }
 

ash/shell/content/client/shell_content_browser_client.cc

@@ -27,9 +27,6 @@
 #include "services/device/public/mojom/constants.mojom.h"
 #include "services/service_manager/public/cpp/manifest.h"
 #include "services/service_manager/public/cpp/manifest_builder.h"
-#include "services/ws/ime/test_ime_driver/public/cpp/manifest.h"
-#include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
-#include "services/ws/public/mojom/constants.mojom.h"
 #include "storage/browser/quota/quota_settings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -51,7 +48,6 @@ const service_manager::Manifest& GetAshShellPackagedServicesOverlayManifest() {
       service_manager::ManifestBuilder()
           .PackageService(service_manager::Manifest(ash::GetManifest())
                               .Amend(ash::GetManifestOverlayForTesting()))
-          .PackageService(test_ime_driver::GetManifest())
           .Build()};
   return *manifest;
 }
@@ -90,11 +86,5 @@ ShellContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) {
   return base::nullopt;
 }
 
-void ShellContentBrowserClient::RegisterOutOfProcessServices(
-    OutOfProcessServiceMap* services) {
-  (*services)[test_ime_driver::mojom::kServiceName] = base::BindRepeating(
-      &base::ASCIIToUTF16, test_ime_driver::mojom::kServiceName);
-}
-
 }  // namespace shell
 }  // namespace ash

ash/shell/content/client/shell_content_browser_client.h

@@ -34,7 +34,6 @@ class ShellContentBrowserClient : public content::ContentBrowserClient {
       storage::OptionalQuotaSettingsCallback callback) override;
   base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
       base::StringPiece name) override;
-  void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
 
  private:
   ShellBrowserMainParts* shell_browser_main_parts_;

ash/shell/content/client/shell_main_delegate.cc

@@ -10,53 +10,13 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "content/public/utility/content_utility_client.h"
 #include "content/public/utility/utility_thread.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/ws/ime/test_ime_driver/public/mojom/constants.mojom.h"
-#include "services/ws/ime/test_ime_driver/test_ime_application.h"
 #include "ui/base/ime/init/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace ash {
 namespace shell {
-namespace {
-
-void TerminateThisProcess() {
-  content::UtilityThread::Get()->ReleaseProcess();
-}
-
-std::unique_ptr<service_manager::Service> CreateTestImeDriver(
-    service_manager::mojom::ServiceRequest request) {
-  return std::make_unique<ws::test::TestIMEApplication>(std::move(request));
-}
-
-class ShellContentUtilityClient : public content::ContentUtilityClient {
- public:
-  ShellContentUtilityClient() = default;
-  ~ShellContentUtilityClient() override = default;
-
-  // content::ContentUtilityClient:
-  bool HandleServiceRequest(
-      const std::string& service_name,
-      service_manager::mojom::ServiceRequest request) override {
-    std::unique_ptr<service_manager::Service> service;
-    if (service_name == test_ime_driver::mojom::kServiceName)
-      service = CreateTestImeDriver(std::move(request));
-
-    if (service) {
-      service_manager::Service::RunAsyncUntilTermination(
-          std::move(service), base::BindOnce(&TerminateThisProcess));
-      return true;
-    }
-    return false;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ShellContentUtilityClient);
-};
-
-}  // namespace
 
 ShellMainDelegate::ShellMainDelegate() = default;
 
@@ -98,10 +58,5 @@ void ShellMainDelegate::InitializeResourceBundle() {
   }
 }
 
-content::ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
-  utility_client_ = std::make_unique<ShellContentUtilityClient>();
-  return utility_client_.get();
-}
-
 }  // namespace shell
 }  // namespace ash

ash/shell/content/client/shell_main_delegate.h

@@ -25,14 +25,12 @@ class ShellMainDelegate : public content::ContentMainDelegate {
   bool BasicStartupComplete(int* exit_code) override;
   void PreSandboxStartup() override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
-  content::ContentUtilityClient* CreateContentUtilityClient() override;
 
  private:
   void InitializeResourceBundle();
 
   std::unique_ptr<ShellContentBrowserClient> browser_client_;
   content::ShellContentClient content_client_;
-  std::unique_ptr<content::ContentUtilityClient> utility_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
 };

ash/system/tray/tray_bubble_wrapper.cc

@@ -10,7 +10,6 @@
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_event_filter.h"
 #include "ash/wm/container_finder.h"
-#include "ash/wm/widget_finder.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/transient_window_manager.h"
@@ -129,7 +128,7 @@ void TrayBubbleWrapper::OnWindowActivated(ActivationReason reason,
   views::Widget* bubble_widget = bubble_view()->GetWidget();
   // Don't close the bubble if a transient child is gaining or losing
   // activation.
-  if (bubble_widget == GetInternalWidgetForWindow(gained_active) ||
+  if (bubble_widget == views::Widget::GetWidgetForNativeView(gained_active) ||
       ::wm::HasTransientAncestor(gained_active,
                                  bubble_widget->GetNativeWindow()) ||
       (lost_active && ::wm::HasTransientAncestor(

ash/system/unified/unified_system_tray_bubble.cc

@@ -16,7 +16,6 @@
 #include "ash/system/unified/unified_system_tray_view.h"
 #include "ash/wm/container_finder.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
-#include "ash/wm/widget_finder.h"
 #include "ash/wm/work_area_insets.h"
 #include "base/metrics/histogram_macros.h"
 #include "ui/aura/window.h"
@@ -268,7 +267,7 @@ void UnifiedSystemTrayBubble::OnWindowActivated(ActivationReason reason,
 
   // Don't close the bubble if a transient child is gaining or losing
   // activation.
-  if (bubble_widget_ == GetInternalWidgetForWindow(gained_active) ||
+  if (bubble_widget_ == views::Widget::GetWidgetForNativeView(gained_active) ||
       ::wm::HasTransientAncestor(gained_active,
                                  bubble_widget_->GetNativeWindow()) ||
       (lost_active && ::wm::HasTransientAncestor(

ash/wm/pip/pip_window_resizer.cc

@@ -10,7 +10,6 @@
 #include "ash/metrics/pip_uma.h"
 #include "ash/wm/collision_detection/collision_detection_utils.h"
 #include "ash/wm/pip/pip_positioner.h"
-#include "ash/wm/widget_finder.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "base/metrics/histogram_functions.h"

ash/wm/widget_finder.cc

-// Copyright 2017 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.
-
-#include "ash/wm/widget_finder.h"
-
-#include "services/ws/window_service.h"
-#include "ui/aura/window.h"
-#include "ui/views/widget/widget.h"
-
-namespace ash {
-
-views::Widget* GetInternalWidgetForWindow(aura::Window* window) {
-  return ws::WindowService::IsProxyWindow(window)
-             ? nullptr
-             : views::Widget::GetWidgetForNativeView(window);
-}
-
-}  // namespace ash

ash/wm/widget_finder.h

-// Copyright 2017 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.
-
-#ifndef ASH_WIDGET_FINDER_H_
-#define ASH_WIDGET_FINDER_H_
-
-#include "ash/ash_export.h"
-
-namespace aura {
-class Window;
-}
-
-namespace views {
-class Widget;
-}
-
-namespace ash {
-
-// Returns the widget associated with |window|, or null if not associated with
-// a widget. Only ash system UI widgets are returned, not widgets created
-// by the mus window manager code to show a non-client frame.
-ASH_EXPORT views::Widget* GetInternalWidgetForWindow(aura::Window* window);
-
-}  // namespace ash
-
-#endif  // ASH_WIDGET_FINDER_H_

ash/wm/window_finder.cc

@@ -10,7 +10,6 @@
 #include "ash/wm/overview/overview_grid.h"
 #include "ash/wm/overview/overview_session.h"
 #include "ash/wm/root_window_finder.h"
-#include "services/ws/window_service.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_targeter.h"
@@ -20,10 +19,7 @@ namespace {
 
 // Returns true if |window| is considered to be a toplevel window.
 bool IsTopLevelWindow(aura::Window* window) {
-  // ui::LAYER_TEXTURED is for non-mash environment. For Mash, browser windows
-  // are not with LAYER_TEXTURED but have a remote client.
-  return window->layer()->type() == ui::LAYER_TEXTURED ||
-         ws::WindowService::IsProxyWindow(window);
+  return window->layer()->type() == ui::LAYER_TEXTURED;
 }
 
 // Returns true if |window| can be a target at |screen_point| by |targeter|.

ash/wm/window_mirror_view.cc

@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <memory>
 
-#include "ash/wm/widget_finder.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"

ash/wm/window_modality_controller_unittest.cc

@@ -9,7 +9,7 @@
 #include "ash/wm/test_child_modal_parent.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
-#include "services/ws/public/mojom/window_manager.mojom.h"
+#include "services/ws/public/mojom/window_tree_constants.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/test/test_window_delegate.h"

ash/wm/window_util.cc

@@ -18,7 +18,6 @@
 #include "ash/wm/splitview/split_view_controller.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "ash/wm/tablet_mode/tablet_mode_observer.h"
-#include "ash/wm/widget_finder.h"
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
@@ -234,7 +233,7 @@ void SetChildrenUseExtendedHitRegionForWindow(aura::Window* window) {
 }
 
 void CloseWidgetForWindow(aura::Window* window) {
-  views::Widget* widget = GetInternalWidgetForWindow(window);
+  views::Widget* widget = views::Widget::GetWidgetForNativeView(window);
   DCHECK(widget);
   widget->Close();
 }

components/arc/BUILD.gn

@@ -124,6 +124,7 @@ static_library("arc") {
     "//ui/events",
     "//ui/events:dom_keycode_converter",
     "//ui/events/ozone:events_ozone_evdev",
+    "//ui/wm/public",
     "//url:url",
   ]
 }

components/exo/wayland/BUILD.gn

@@ -220,6 +220,7 @@ source_set("unit_tests") {
       "//ui/compositor:test_support",
       "//ui/display",
       "//ui/gfx",
+      "//ui/wm/public",
     ]
   }
 }