Split window_tree_host.mojom into smaller interfaces

This CL splits window_tree_host.mojom, separating WindowTreeHostFactory
interface declaration into its own mojom file.

In practice, there is no behavior change at all, but the separation makes
it easier for downstreamers to having a Mojo interface sibling of
WindowTreeHostFactory (for instance, in case of external window mode,
there is a ExternalWindowTreeHostFactory, which has a different API).

BUG=666958

Change-Id: I664f9ac3895612b53c6a4b1cfc85785554fe9bab
Reviewed-on: https://chromium-review.googlesource.com/767527Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Maksim Sisov <msisov@igalia.com>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#517070}

services/ui/demo/mus_demo_external.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "services/ui/demo/mus_demo.h"
-#include "services/ui/public/interfaces/window_tree_host.mojom.h"
+#include "services/ui/public/interfaces/window_tree_host_factory.mojom.h"
 
 namespace ui {
 namespace demo {

services/ui/public/interfaces/BUILD.gn

@@ -24,6 +24,7 @@ mojom("interfaces") {
     "window_tree.mojom",
     "window_tree_constants.mojom",
     "window_tree_host.mojom",
+    "window_tree_host_factory.mojom",
   ]
 
   import_dirs = [

services/ui/public/interfaces/window_tree_host.mojom

@@ -4,7 +4,6 @@
 
 module ui.mojom;
 
-import "services/ui/public/interfaces/window_tree.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
 // WindowTreeHost encapsulates a unique underlying platform window, with a tree
@@ -16,10 +15,3 @@ interface WindowTreeHost {
   // Sets a title string to be displayed on the platform window.
   SetTitle(string title);
 };
-
-interface WindowTreeHostFactory {
-  // Creates a new WindowTreeHost. |tree_client| is queried for the
-  // WindowManager.
-  CreateWindowTreeHost(WindowTreeHost& window_tree_host,
-                       WindowTreeClient tree_client);
-};

services/ui/public/interfaces/window_tree_host_factory.mojom

+// 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.
+
+module ui.mojom;
+
+import "services/ui/public/interfaces/window_tree.mojom";
+import "services/ui/public/interfaces/window_tree_host.mojom";
+
+interface WindowTreeHostFactory {
+  // Creates a new WindowTreeHost. |tree_client| is queried for the
+  // WindowManager.
+  CreateWindowTreeHost(WindowTreeHost& window_tree_host,
+                       WindowTreeClient tree_client);
+};

services/ui/service.h

@@ -35,7 +35,7 @@
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "services/ui/public/interfaces/window_server_test.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
-#include "services/ui/public/interfaces/window_tree_host.mojom.h"
+#include "services/ui/public/interfaces/window_tree_host_factory.mojom.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/window_server_delegate.h"
 

services/ui/ws/display_binding.h

@@ -9,6 +9,7 @@
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
 #include "services/ui/ws/user_id.h"
 

services/ui/ws/window_tree_client_unittest.cc

@@ -18,7 +18,7 @@
 #include "services/service_manager/public/cpp/service_test.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
-#include "services/ui/public/interfaces/window_tree_host.mojom.h"
+#include "services/ui/public/interfaces/window_tree_host_factory.mojom.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/test_change_tracker.h"
 #include "services/ui/ws/window_server_service_test_base.h"

services/ui/ws/window_tree_host_factory.h

@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/ui/public/interfaces/window_tree_host.mojom.h"
+#include "services/ui/public/interfaces/window_tree_host_factory.mojom.h"
 #include "services/ui/ws/user_id.h"
 
 namespace ui {

ui/aura/mus/window_tree_client.cc

@@ -29,7 +29,7 @@
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
-#include "services/ui/public/interfaces/window_tree_host.mojom.h"
+#include "services/ui/public/interfaces/window_tree_host_factory.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/transient_window_client.h"