RemoteMacViews: Let AppShimHost create views_bridge_mac::BridgeFactorys

Add a method to chrome::mojom::AppShim that will create a
views_bridge_mac::BridgeFactory.

Add a views_bridge_mac::BridgeFactoryHost member to chrome::AppShim.
(This will be plumbed to NativeWidgetMac::InitWidgetMac via the
BrowserFrameMac sub-class, which lives in chrome).

Add myself as an OWNER for chrome/app_shim and
chrome/browser/apps/app_shim.

Bug: 859152
Change-Id: I1aaa46376599e0bf88f6f16b461c941c851c431c
Reviewed-on: https://chromium-review.googlesource.com/1229697
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592253}

chrome/app_shim/BUILD.gn

@@ -21,6 +21,7 @@ source_set("app_shim") {
     "//ipc",
     "//mojo/core/embedder",
     "//ui/base",
+    "//ui/views:views",
   ]
 }
 

chrome/app_shim/OWNERS

+ccameron@chromium.org
 dominickn@chromium.org
 tapted@chromium.org

chrome/app_shim/chrome_main_app_mode_mac.mm

@@ -8,6 +8,7 @@
 // those app bundles.
 
 #import <Cocoa/Cocoa.h>
+#include <utility>
 #include <vector>
 
 #include "base/at_exit.h"
@@ -43,6 +44,8 @@
 #include "mojo/public/cpp/system/isolated_connection.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/cocoa/bridge_factory_impl.h"
+#include "ui/views_bridge_mac/mojo/bridge_factory.mojom.h"
 
 namespace {
 
@@ -126,6 +129,8 @@ class AppShimController : public chrome::mojom::AppShim {
 
   // chrome::mojom::AppShim implementation.
   void LaunchAppDone(apps::AppShimLaunchResult result) override;
+  void CreateViewsBridgeFactory(
+      views_bridge_mac::mojom::BridgeFactoryRequest request) override;
   void Hide() override;
   void UnhideWithoutActivation() override;
   void SetUserAttention(apps::AppShimAttentionType attention_type) override;
@@ -303,6 +308,11 @@ void AppShimController::LaunchAppDone(apps::AppShimLaunchResult result) {
   launch_app_done_ = true;
 }
 
+void AppShimController::CreateViewsBridgeFactory(
+    views_bridge_mac::mojom::BridgeFactoryRequest request) {
+  views_bridge_mac::BridgeFactoryImpl::Get()->BindRequest(std::move(request));
+}
+
 void AppShimController::Hide() {
   [NSApp hide:nil];
 }

chrome/browser/apps/app_shim/BUILD.gn

@@ -37,5 +37,6 @@ source_set("app_shim") {
     "//content/public/common",
     "//extensions/browser",
     "//extensions/common",
+    "//ui/views:views",
   ]
 }

chrome/browser/apps/app_shim/OWNERS

+ccameron@chromium.org
 dominickn@chromium.org
 tapted@chromium.org

chrome/browser/apps/app_shim/app_shim_host_mac.cc

@@ -11,6 +11,8 @@
 #include "base/logging.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
 #include "content/public/browser/browser_thread.h"
+#include "ui/base/ui_base_features.h"
+#include "ui/views_bridge_mac/mojo/bridge_factory.mojom.h"
 
 AppShimHost::AppShimHost()
     : host_binding_(this), initial_launch_finished_(false) {}
@@ -63,6 +65,15 @@ void AppShimHost::LaunchApp(chrome::mojom::AppShimPtr app_shim_ptr,
     return;
 
   app_shim_ = std::move(app_shim_ptr);
+  // Create the interface that will be used by views::NativeWidgetMac to create
+  // NSWindows hosted in the app shim process.
+  if (features::HostWindowsInAppShimProcess()) {
+    views_bridge_mac::mojom::BridgeFactoryRequest views_bridge_factory_request;
+    views_bridge_factory_host_ = std::make_unique<views::BridgeFactoryHost>(
+        &views_bridge_factory_request);
+    app_shim_->CreateViewsBridgeFactory(
+        std::move(views_bridge_factory_request));
+  }
   profile_path_ = profile_dir;
   app_id_ = app_id;
 

chrome/browser/apps/app_shim/app_shim_host_mac.h

@@ -16,6 +16,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/platform/platform_channel_endpoint.h"
 #include "mojo/public/cpp/system/isolated_connection.h"
+#include "ui/views/cocoa/bridge_factory_host.h"
 
 // This is the counterpart to AppShimController in
 // chrome/app/chrome_main_app_mode_mac.mm. The AppShimHost owns itself, and is
@@ -61,6 +62,7 @@ class AppShimHost : public chrome::mojom::AppShimHost,
 
   mojo::IsolatedConnection mojo_connection_;
   chrome::mojom::AppShimPtr app_shim_;
+  std::unique_ptr<views::BridgeFactoryHost> views_bridge_factory_host_;
   mojo::Binding<chrome::mojom::AppShimHost> host_binding_;
   std::string app_id_;
   base::FilePath profile_path_;

chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc

@@ -44,6 +44,8 @@ class TestingAppShim : public chrome::mojom::AppShim {
     received_launch_done_result_ = true;
     launch_done_result_ = result;
   }
+  void CreateViewsBridgeFactory(
+      views_bridge_mac::mojom::BridgeFactoryRequest request) override {}
   void Hide() override {}
   void UnhideWithoutActivation() override {}
   void SetUserAttention(apps::AppShimAttentionType attention_type) override {}

chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm

@@ -49,6 +49,8 @@ class TestShimClient : public chrome::mojom::AppShim {
 
   // chrome::mojom::AppShim implementation (not used in testing, but can be).
   void LaunchAppDone(apps::AppShimLaunchResult result) override {}
+  void CreateViewsBridgeFactory(
+      views_bridge_mac::mojom::BridgeFactoryRequest request) override {}
   void Hide() override {}
   void UnhideWithoutActivation() override {}
   void SetUserAttention(apps::AppShimAttentionType attention_type) override {}

chrome/common/BUILD.gn

@@ -738,6 +738,10 @@ mojom("mojo_bindings") {
     "//url/mojom:url_mojom_origin",
   ]
 
+  if (is_mac) {
+    public_deps += [ "//ui/views_bridge_mac:mojo" ]
+  }
+
   if (safe_browsing_mode == 1) {
     public_deps += [ "//chrome/services/file_util/public/mojom" ]
   }

chrome/common/mac/app_shim.mojom

@@ -5,6 +5,7 @@
 module chrome.mojom;
 
 import "mojo/public/mojom/base/file_path.mojom";
+import "ui/views_bridge_mac/mojo/bridge_factory.mojom";
 
 [Native]
 enum AppShimLaunchType;
@@ -20,6 +21,11 @@ enum AppShimAttentionType;
 
 // Interface through which the browser communicates to a shim process.
 interface AppShim {
+  // Create the interface through which BridgedNativeWidget instances may be
+  // created (for views::Widgets whose NSWindows exist in the app shim process).
+  CreateViewsBridgeFactory(
+      views_bridge_mac.mojom.BridgeFactory& views_bridge_factory);
+
   // Signals that a previous LaunchApp message has been processed, and lets the
   // app shim process know whether it was registered successfully.
   LaunchAppDone(AppShimLaunchResult launch_result);

ui/views/BUILD.gn

@@ -85,6 +85,8 @@ jumbo_component("views") {
     "bubble/info_bubble.h",
     "bubble/tooltip_icon.h",
     "button_drag_utils.h",
+    "cocoa/bridge_factory_host.h",
+    "cocoa/bridge_factory_impl.h",
     "cocoa/bridged_native_widget.h",
     "cocoa/native_widget_mac_nswindow.h",
     "cocoa/window_touch_bar_delegate.h",
@@ -439,8 +441,6 @@ jumbo_component("views") {
   # public into this list, along with the implementation file.
   sources += [
     "cocoa/bridge_factory_host.cc",
-    "cocoa/bridge_factory_host.h",
-    "cocoa/bridge_factory_impl.h",
     "cocoa/bridge_factory_impl.mm",
     "cocoa/bridged_content_view.h",
     "cocoa/bridged_content_view.mm",

ui/views_bridge_mac/BUILD.gn

@@ -5,7 +5,6 @@
 import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojo") {
-  cpp_only = true
   assert(is_mac)
 
   sources = [