cros: Move autoclick mojo app into //ash/components

This is an existing example of how a built-in ash feature can be done
with a mojo app, so put it in //ash/components.

Bug: 815334
Test: ash_unittests, autoclick still works in mash
Change-Id: I1d38901a96708cbd2d3fc17c39f66e537851a61b
Reviewed-on: https://chromium-review.googlesource.com/935755Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539337}

ash/BUILD.gn

@@ -1070,7 +1070,7 @@ component("ash") {
   ]
   deps = [
     "//ash/autoclick/common:autoclick",
-    "//ash/autoclick/mus/public/mojom",
+    "//ash/components/autoclick/public/mojom",
     "//ash/touch_hud",
     "//base",
     "//base:i18n",
@@ -1143,7 +1143,7 @@ component("ash") {
   ]
 
   data_deps = [
-    "//ash/autoclick/mus:accessibility_autoclick",
+    "//ash/components/autoclick:autoclick_app",
     "//ash/touch_hud/mus:touch_hud",
   ]
 

ash/DEPS

@@ -42,6 +42,9 @@ include_rules = [
   # header required to launch the app.
   "-ash/components",
 
+  # Ash can talk to public interfaces for mini-apps.
+  "+ash/components/autoclick/public",
+
   # Ash sits above content. Exceptions live in //ash/content.
   "-content",
 

ash/accessibility/accessibility_controller.cc

@@ -9,7 +9,7 @@
 
 #include "ash/accessibility/accessibility_highlight_controller.h"
 #include "ash/autoclick/autoclick_controller.h"
-#include "ash/autoclick/mus/public/mojom/autoclick.mojom.h"
+#include "ash/components/autoclick/public/mojom/autoclick.mojom.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/config.h"
@@ -442,7 +442,7 @@ void AccessibilityController::UpdateAutoclickFromPref() {
     if (!connector_)  // Null in tests.
       return;
     mash::mojom::LaunchablePtr launchable;
-    connector_->BindInterface("accessibility_autoclick", &launchable);
+    connector_->BindInterface("autoclick_app", &launchable);
     launchable->Launch(mash::mojom::kWindow, mash::mojom::LaunchMode::DEFAULT);
     return;
   }
@@ -463,7 +463,7 @@ void AccessibilityController::UpdateAutoclickDelayFromPref() {
     if (!connector_)  // Null in tests.
       return;
     autoclick::mojom::AutoclickControllerPtr autoclick_controller;
-    connector_->BindInterface("accessibility_autoclick", &autoclick_controller);
+    connector_->BindInterface("autoclick_app", &autoclick_controller);
     autoclick_controller->SetAutoclickDelay(autoclick_delay_.InMilliseconds());
     return;
   }

ash/autoclick/mus/BUILD.gn → ash/components/autoclick/BUILD.gn

@@ -15,7 +15,7 @@ source_set("lib") {
 
   deps = [
     "//ash/autoclick/common:autoclick",
-    "//ash/autoclick/mus/public/mojom",
+    "//ash/components/autoclick/public/mojom",
     "//ash/public/cpp",
     "//base",
     "//mash/public/mojom",
@@ -30,7 +30,7 @@ source_set("lib") {
   ]
 }
 
-service("accessibility_autoclick") {
+service("autoclick_app") {
   sources = [
     "main.cc",
   ]
@@ -47,6 +47,6 @@ service("accessibility_autoclick") {
 }
 
 service_manifest("manifest") {
-  name = "accessibility_autoclick"
+  name = "autoclick_app"
   source = "manifest.json"
 }

ash/autoclick/mus/DEPS → ash/components/autoclick/DEPS

 include_rules = [
-  "-ash",
   "+ash/autoclick/common",
-  "+ash/autoclick/mus",
-  "+ash/public",
+  "+ash/components/autoclick",
+  "+base",
   "+mash/public/mojom",
   "+mojo/public",
   "+services/service_manager/public",
   "+services/ui/public",
+  "+ui/aura/mus",
+  "+ui/base",
+  "+ui/views",
 ]

ash/autoclick/mus/autoclick_application.cc → ash/components/autoclick/autoclick_application.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/autoclick/mus/autoclick_application.h"
+#include "ash/components/autoclick/autoclick_application.h"
 
 #include <utility>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
-#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
@@ -23,18 +22,21 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace ash {
 namespace autoclick {
+namespace {
 
 // The default wait time between last mouse movement and sending
 // the autoclick.
 const int kDefaultAutoclickDelayMs = 1000;
 
+}  // namespace
+
 // AutoclickUI handles events to the autoclick app.
 class AutoclickUI : public views::WidgetDelegateView,
                     public views::PointerWatcher {
  public:
-  explicit AutoclickUI(AutoclickControllerCommon* autoclick_controller_common)
+  explicit AutoclickUI(
+      ash::AutoclickControllerCommon* autoclick_controller_common)
       : autoclick_controller_common_(autoclick_controller_common) {
     views::MusClient::Get()->pointer_watcher_event_router()->AddPointerWatcher(
         this, true /* want_moves */);
@@ -74,18 +76,18 @@ class AutoclickUI : public views::WidgetDelegateView,
     }
   }
 
-  AutoclickControllerCommon* autoclick_controller_common_;
+  ash::AutoclickControllerCommon* autoclick_controller_common_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoclickUI);
 };
 
 AutoclickApplication::AutoclickApplication()
     : launchable_binding_(this), autoclick_binding_(this) {
-  registry_.AddInterface<mash::mojom::Launchable>(base::Bind(
+  registry_.AddInterface<mash::mojom::Launchable>(base::BindRepeating(
       &AutoclickApplication::BindLaunchableRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::AutoclickController>(
-      base::Bind(&AutoclickApplication::BindAutoclickControllerRequest,
-                 base::Unretained(this)));
+      base::BindRepeating(&AutoclickApplication::BindAutoclickControllerRequest,
+                          base::Unretained(this)));
 }
 
 AutoclickApplication::~AutoclickApplication() = default;
@@ -100,8 +102,9 @@ void AutoclickApplication::OnStart() {
     context()->QuitNow();
     return;
   }
-  autoclick_controller_common_.reset(new AutoclickControllerCommon(
-      base::TimeDelta::FromMilliseconds(kDefaultAutoclickDelayMs), this));
+  autoclick_controller_common_ =
+      std::make_unique<ash::AutoclickControllerCommon>(
+          base::TimeDelta::FromMilliseconds(kDefaultAutoclickDelayMs), this);
 }
 
 void AutoclickApplication::OnBindInterface(
@@ -129,7 +132,7 @@ void AutoclickApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) {
     widget_->Init(params);
   } else {
     widget_->Close();
-    base::RunLoop::QuitCurrentWhenIdleDeprecated();
+    context()->QuitNow();
   }
 }
 
@@ -164,7 +167,7 @@ void AutoclickApplication::UpdateAutoclickRingWidget(
 void AutoclickApplication::DoAutoclick(const gfx::Point& event_location,
                                        const int mouse_event_flags) {
   // TODO(riajiang): Currently not working. Need to know how to generate events
-  // in mus world (crbug.com/628665).
+  // in mus world. https://crbug.com/628665
 }
 
 void AutoclickApplication::OnAutoclickCanceled() {
@@ -172,4 +175,3 @@ void AutoclickApplication::OnAutoclickCanceled() {
 }
 
 }  // namespace autoclick
-}  // namespace ash

ash/autoclick/mus/autoclick_application.h → ash/components/autoclick/autoclick_application.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_AUTOCLICK_MUS_AUTOCLICK_APPLICATION_H_
-#define ASH_AUTOCLICK_MUS_AUTOCLICK_APPLICATION_H_
+#ifndef ASH_COMPONENTS_AUTOCLICK_AUTOCLICK_APPLICATION_H_
+#define ASH_COMPONENTS_AUTOCLICK_AUTOCLICK_APPLICATION_H_
 
 #include <map>
 
 #include "ash/autoclick/common/autoclick_controller_common.h"
 #include "ash/autoclick/common/autoclick_controller_common_delegate.h"
-#include "ash/autoclick/mus/public/mojom/autoclick.mojom.h"
+#include "ash/components/autoclick/public/mojom/autoclick.mojom.h"
 #include "base/macros.h"
 #include "mash/public/mojom/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -20,15 +20,14 @@
 namespace views {
 class AuraInit;
 class Widget;
-}
+}  // namespace views
 
-namespace ash {
 namespace autoclick {
 
 class AutoclickApplication : public service_manager::Service,
                              public mash::mojom::Launchable,
                              public mojom::AutoclickController,
-                             public AutoclickControllerCommonDelegate {
+                             public ash::AutoclickControllerCommonDelegate {
  public:
   AutoclickApplication();
   ~AutoclickApplication() override;
@@ -53,7 +52,7 @@ class AutoclickApplication : public service_manager::Service,
   void BindAutoclickControllerRequest(
       mojom::AutoclickControllerRequest request);
 
-  // AutoclickControllerCommonDelegate:
+  // ash::AutoclickControllerCommonDelegate:
   views::Widget* CreateAutoclickRingWidget(
       const gfx::Point& event_location) override;
   void UpdateAutoclickRingWidget(views::Widget* widget,
@@ -67,7 +66,7 @@ class AutoclickApplication : public service_manager::Service,
   mojo::Binding<mojom::AutoclickController> autoclick_binding_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
-  std::unique_ptr<AutoclickControllerCommon> autoclick_controller_common_;
+  std::unique_ptr<ash::AutoclickControllerCommon> autoclick_controller_common_;
   std::unique_ptr<views::Widget> widget_;
 
   bool running_standalone_ = false;
@@ -76,6 +75,5 @@ class AutoclickApplication : public service_manager::Service,
 };
 
 }  // namespace autoclick
-}  // namespace ash
 
-#endif  // ASH_AUTOCLICK_MUS_AUTOCLICK_APPLICATION_H_
+#endif  // ASH_COMPONENTS_AUTOCLICK_AUTOCLICK_APPLICATION_H_

ash/autoclick/mus/main.cc → ash/components/autoclick/main.cc

@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/autoclick/mus/autoclick_application.h"
+#include "ash/components/autoclick/autoclick_application.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
-  ash::autoclick::AutoclickApplication* app =
-      new ash::autoclick::AutoclickApplication;
+  autoclick::AutoclickApplication* app = new autoclick::AutoclickApplication;
   app->set_running_standalone(true);
   service_manager::ServiceRunner runner(app);
   return runner.Run(service_request_handle);

ash/autoclick/mus/manifest.json → ash/components/autoclick/manifest.json

 {
-  "name": "accessibility_autoclick",
+  "name": "autoclick_app",
   "display_name": "Autoclick",
   "sandbox_type": "none",
   "interface_provider_specs": {
     "service_manager:connector": {
       "provides": {
         "mash:launchable": [ "mash::mojom::Launchable" ],
-        "ash:autoclick": [ "ash::autoclick::mojom::AutoclickController" ]
+        "chromeos:autoclick": [ "autoclick::mojom::AutoclickController" ]
       },
       "requires": {
         "*": [ "app" ],

ash/autoclick/mus/public/mojom/autoclick.mojom → ash/components/autoclick/public/mojom/autoclick.mojom

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-module ash.autoclick.mojom;
+module autoclick.mojom;
 
 // Used by Chrome to set the time to wait in milliseconds from when the mouse
-// stops moving to when the autoclick event is sent in accessibility_autoclick.
+// stops moving to when the autoclick event is sent in autoclick_app.
 interface AutoclickController {
   SetAutoclickDelay(uint32 delay_in_milliseconds);
 };

ash/manifest.json

@@ -49,8 +49,8 @@
       },
       "requires": {
         "*": [ "accessibility", "app" ],
-        "accessibility_autoclick": [
-          "ash:autoclick",
+        "autoclick_app": [
+          "chromeos:autoclick",
           "mash:launchable"
         ],
         "ash_pref_connector": [ "pref_connector" ],

chrome/app/BUILD.gn

@@ -440,12 +440,10 @@ service_manifest("chrome_content_packaged_services_manifest_overlay") {
   source =
       "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
   packaged_services = chrome_packaged_services
-  if (enable_mus) {
-    packaged_services += [ "//ash/components/quick_launch:manifest" ]
-  }
   if (is_chromeos) {
     packaged_services += [
-      "//ash/autoclick/mus:manifest",
+      "//ash/components/autoclick:manifest",
+      "//ash/components/quick_launch:manifest",
       "//ash:manifest",
       "//ash/touch_hud/mus:manifest",
       "//components/font_service:manifest",

chrome/browser/chrome_content_browser_manifest_overlay.json

@@ -27,7 +27,7 @@
         ]
       },
       "requires": {
-        "accessibility_autoclick": [ "ash:autoclick" ],
+        "autoclick_app": [ "chromeos:autoclick" ],
         "ash": [ "system_ui", "test", "display" ],
         // Only used in classic ash case.
         "ash_pref_connector": [ "pref_connector" ],

chrome/browser/mash_service_registry.cc

@@ -27,7 +27,7 @@ constexpr Service kServices[] = {
     {ui::mojom::kServiceName, "UI Service", kAshAndUiProcessGroup},
     {ash::mojom::kServiceName, "Ash Window Manager and Shell",
      kAshAndUiProcessGroup},
-    {"accessibility_autoclick", "Ash Accessibility Autoclick", nullptr},
+    {"autoclick_app", "Accessibility Autoclick", nullptr},
     {"touch_hud", "Ash Touch Hud", nullptr},
     {font_service::mojom::kServiceName, "Font Service", nullptr},
 };

chrome/utility/BUILD.gn

@@ -149,7 +149,7 @@ static_library("utility") {
     ]
     deps += [
       "//ash",
-      "//ash/autoclick/mus:lib",
+      "//ash/components/autoclick:lib",
       "//ash/components/quick_launch:lib",
       "//ash/components/quick_launch/public/mojom",
       "//ash/touch_hud/mus:lib",

chrome/utility/DEPS

@@ -45,7 +45,7 @@ include_rules = [
 
 specific_include_rules = {
   "mash_service_factory.cc": [
-    "+ash/autoclick/mus/autoclick_application.h",
+    "+ash/components/autoclick/autoclick_application.h",
     "+ash/components/quick_launch/public",
     "+ash/components/quick_launch/quick_launch.h",
     "+ash/public/interfaces",

chrome/utility/mash_service_factory.cc

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "ash/autoclick/mus/autoclick_application.h"
+#include "ash/components/autoclick/autoclick_application.h"
 #include "ash/components/quick_launch/public/mojom/constants.mojom.h"
 #include "ash/components/quick_launch/quick_launch.h"
 #include "ash/public/interfaces/constants.mojom.h"
@@ -67,8 +67,8 @@ std::unique_ptr<service_manager::Service> CreateAshService() {
       show_primary_host_on_connect);
 }
 
-std::unique_ptr<service_manager::Service> CreateAccessibilityAutoclick() {
-  return std::make_unique<ash::autoclick::AutoclickApplication>();
+std::unique_ptr<service_manager::Service> CreateAutoclickApp() {
+  return std::make_unique<autoclick::AutoclickApplication>();
 }
 
 std::unique_ptr<service_manager::Service> CreateQuickLaunch() {
@@ -96,8 +96,7 @@ void MashServiceFactory::RegisterOutOfProcessServices(
   RegisterMashService(services, quick_launch::mojom::kServiceName,
                       &CreateQuickLaunch);
   RegisterMashService(services, ash::mojom::kServiceName, &CreateAshService);
-  RegisterMashService(services, "accessibility_autoclick",
-                      &CreateAccessibilityAutoclick);
+  RegisterMashService(services, "autoclick_app", &CreateAutoclickApp);
   RegisterMashService(services, "touch_hud", &CreateTouchHud);
   RegisterMashService(services, font_service::mojom::kServiceName,
                       &CreateFontService);

mash/BUILD.gn

@@ -26,7 +26,7 @@ group("all") {
   # Build on platforms that support ash.
   if (is_chromeos) {
     deps += [
-      "//ash/autoclick/mus:accessibility_autoclick",
+      "//ash/components/autoclick:autoclick_app",
       "//ash/components/quick_launch",
       "//ash/standalone:ash_standalone",
       "//ash/touch_hud/mus:touch_hud",