Makes it possible for clients to directly create WindowTreeHostMus

ui/aura/mus/window_port_mus.cc

Index: ui/aura/mus/window_port_mus.cc
diff --git a/ui/aura/mus/window_port_mus.cc b/ui/aura/mus/window_port_mus.cc
index aca205afc46f6600616096bff1f702b20a4d3d14..ef8c087199fd8d8a59a1a60b3af642b7bd72fd56 100644
--- a/ui/aura/mus/window_port_mus.cc
+++ b/ui/aura/mus/window_port_mus.cc
@@ -26,8 +26,8 @@ WindowMus* WindowMus::Get(Window* window) {
 }
 
 WindowPortMus::WindowPortMus(WindowTreeClient* client,
-                             bool create_remote_window)
-    : WindowMus(create_remote_window), window_tree_client_(client) {}
+                             WindowMusType window_mus_type)
+    : WindowMus(window_mus_type), window_tree_client_(client) {}
 
 WindowPortMus::~WindowPortMus() {
   if (surface_info_)
@@ -120,7 +120,6 @@ Window* WindowPortMus::GetWindow() {
 }
 
 void WindowPortMus::AddChildFromServer(WindowMus* window) {
-  DCHECK(has_server_window());

[sadrul, 2016/11/02 16:03:04]

Some of these DCHECK()s should still be OK?

[sky, 2016/11/02 16:53:23]

The DCHECKs were intended to catch the case of windows with no associated server
window. Previously this was only possible for the roots of WindowTreeHostMus (in
some cases). As this change make it so these windows now have associated server
windows too the DCHECK didn't seem useful. It's true the DCHECK would catch not
assigning a server id, but that is really separate from what the DCHECKs were
intended for originally. WDYT?

   ServerChangeData data;
   data.child_id = window->server_id();
   ScopedServerChange change(this, ServerChangeType::ADD, data);
@@ -128,7 +127,6 @@ void WindowPortMus::AddChildFromServer(WindowMus* window) {
 }
 
 void WindowPortMus::RemoveChildFromServer(WindowMus* child) {
-  DCHECK(has_server_window());
   ServerChangeData data;
   data.child_id = child->server_id();
   ScopedServerChange change(this, ServerChangeType::REMOVE, data);
@@ -138,7 +136,6 @@ void WindowPortMus::RemoveChildFromServer(WindowMus* child) {
 void WindowPortMus::ReorderFromServer(WindowMus* child,
                                       WindowMus* relative,
                                       ui::mojom::OrderDirection direction) {
-  DCHECK(has_server_window());
   // Keying off solely the id isn't entirely accurate, in so far as if Window
   // does some other reordering then the server and client are out of sync.
   // But we assume only one client can make changes to a particular window at
@@ -153,7 +150,6 @@ void WindowPortMus::ReorderFromServer(WindowMus* child,
 }
 
 void WindowPortMus::SetBoundsFromServer(const gfx::Rect& bounds) {
-  DCHECK(has_server_window());
   ServerChangeData data;
   data.bounds = bounds;
   ScopedServerChange change(this, ServerChangeType::BOUNDS, data);
@@ -161,7 +157,6 @@ void WindowPortMus::SetBoundsFromServer(const gfx::Rect& bounds) {
 }
 
 void WindowPortMus::SetVisibleFromServer(bool visible) {
-  DCHECK(has_server_window());
   ServerChangeData data;
   data.visible = visible;
   ScopedServerChange change(this, ServerChangeType::VISIBLE, data);
@@ -172,8 +167,7 @@ void WindowPortMus::SetVisibleFromServer(bool visible) {
 }
 
 void WindowPortMus::SetOpacityFromServer(float opacity) {
-  // TODO(sky): this may not be necessary anymore.
-  DCHECK(has_server_window());
+  // TODO(sky): route to server.
   // Changes to opacity don't make it back to the server.
   window_->layer()->SetOpacity(opacity);
 }
@@ -216,7 +210,6 @@ void WindowPortMus::SetSurfaceIdFromServer(
 }
 
 void WindowPortMus::AddTransientChildFromServer(WindowMus* child) {
-  DCHECK(has_server_window());
   ServerChangeData data;
   data.child_id = child->server_id();
   ScopedServerChange change(this, ServerChangeType::ADD_TRANSIENT, data);
@@ -225,7 +218,6 @@ void WindowPortMus::AddTransientChildFromServer(WindowMus* child) {
 }
 
 void WindowPortMus::RemoveTransientChildFromServer(WindowMus* child) {
-  DCHECK(has_server_window());
   ServerChangeData data;
   data.child_id = child->server_id();
   ScopedServerChange change(this, ServerChangeType::REMOVE_TRANSIENT, data);
@@ -235,7 +227,6 @@ void WindowPortMus::RemoveTransientChildFromServer(WindowMus* child) {
 
 WindowPortMus::ChangeSource WindowPortMus::OnTransientChildAdded(
     WindowMus* child) {
-  DCHECK(has_server_window());
   ServerChangeData change_data;
   change_data.child_id = child->server_id();
   // If there was a change it means we scheduled the change by way of
@@ -247,7 +238,6 @@ WindowPortMus::ChangeSource WindowPortMus::OnTransientChildAdded(
 
 WindowPortMus::ChangeSource WindowPortMus::OnTransientChildRemoved(
     WindowMus* child) {
-  DCHECK(has_server_window());
   ServerChangeData change_data;
   change_data.child_id = child->server_id();
   // If there was a change it means we scheduled the change by way of
@@ -285,21 +275,14 @@ void WindowPortMus::NotifyEmbeddedAppDisconnected() {
     observer.OnEmbeddedAppDisconnected(window_);
 }
 
-std::unique_ptr<WindowPortInitData> WindowPortMus::OnPreInit(Window* window) {
+void WindowPortMus::OnPreInit(Window* window) {
   window_ = window;
-  return window_tree_client_->OnWindowMusCreated(this);
-}
-
-void WindowPortMus::OnPostInit(std::unique_ptr<WindowPortInitData> init_data) {
-  window_tree_client_->OnWindowMusInitDone(this, std::move(init_data));
+  window_tree_client_->OnWindowMusCreated(this);
 }
 
 void WindowPortMus::OnDeviceScaleFactorChanged(float device_scale_factor) {}
 
 void WindowPortMus::OnWillAddChild(Window* child) {
-  if (!has_server_window())
-    return;
-
   ServerChangeData change_data;
   change_data.child_id = Get(child)->server_id();
   if (!RemoveChangeByTypeAndData(ServerChangeType::ADD, change_data))
@@ -307,9 +290,6 @@ void WindowPortMus::OnWillAddChild(Window* child) {
 }
 
 void WindowPortMus::OnWillRemoveChild(Window* child) {
-  if (!has_server_window())
-    return;
-
   ServerChangeData change_data;
   change_data.child_id = Get(child)->server_id();
   if (!RemoveChangeByTypeAndData(ServerChangeType::REMOVE, change_data))
@@ -317,9 +297,6 @@ void WindowPortMus::OnWillRemoveChild(Window* child) {
 }
 
 void WindowPortMus::OnWillMoveChild(size_t current_index, size_t dest_index) {
-  if (!has_server_window())
-    return;
-
   ServerChangeData change_data;
   change_data.child_id = Get(window_->children()[current_index])->server_id();
   if (!RemoveChangeByTypeAndData(ServerChangeType::REORDER, change_data))
@@ -327,9 +304,6 @@ void WindowPortMus::OnWillMoveChild(size_t current_index, size_t dest_index) {
 }
 
 void WindowPortMus::OnVisibilityChanged(bool visible) {
-  if (!has_server_window())
-    return;
-
   ServerChangeData change_data;
   change_data.visible = visible;
   if (!RemoveChangeByTypeAndData(ServerChangeType::VISIBLE, change_data))
@@ -338,9 +312,6 @@ void WindowPortMus::OnVisibilityChanged(bool visible) {
 
 void WindowPortMus::OnDidChangeBounds(const gfx::Rect& old_bounds,
                                       const gfx::Rect& new_bounds) {
-  if (!has_server_window())
-    return;
-
   ServerChangeData change_data;
   change_data.bounds = new_bounds;
   if (!RemoveChangeByTypeAndData(ServerChangeType::BOUNDS, change_data))
@@ -349,18 +320,12 @@ void WindowPortMus::OnDidChangeBounds(const gfx::Rect& old_bounds,
 
 std::unique_ptr<WindowPortPropertyData> WindowPortMus::OnWillChangeProperty(
     const void* key) {
-  if (!has_server_window())
-    return nullptr;
-
   return window_tree_client_->OnWindowMusWillChangeProperty(this, key);
 }
 
 void WindowPortMus::OnPropertyChanged(
     const void* key,
     std::unique_ptr<WindowPortPropertyData> data) {
-  if (!has_server_window())
-    return;
-
   ServerChangeData change_data;
   change_data.property_name =
       GetPropertyConverter()->GetTransportNameForPropertyKey(key);