Makes it possible for clients to directly create WindowTreeHostMus

ui/aura/mus/window_mus.h

 // Copyright 2016 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 UI_AURA_MUS_WINDOW_MUS_H_
 #define UI_AURA_MUS_WINDOW_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 27 matching lines @@
 
 // WindowMus defines the interface used by WindowTreeClient to modify
 // the underlying Window. It's defined as a separate interface to make it clear
 // that any changes that WindowTreeClient makes must be propagated through
 // this interface so that they don't result in bouncing back to
 // WindowTreeClient. For example, if the server change the bounds care must be
 // taken that when the change is applied to the Window the server isn't asked to
 // change the bounds too. See WindowPortMus for details.
 class AURA_EXPORT WindowMus {
  public:
-
   enum class ChangeSource {
     // The change was made locally.
     LOCAL,
     // The change originated from the server.
     SERVER,
   };
 
-  // |create_remote_window| indicates whether a window should be created on the
-  // server. Generally |create_remote_window| should be true, only in rare
-  // exceptions (such as the root of a WindowTreeHost) is it false.
-  explicit WindowMus(bool create_remote_window)
-      : create_remote_window_(create_remote_window) {}
+  explicit WindowMus(WindowMusType window_mus_type)
+      : window_mus_type_(window_mus_type) {}
   virtual ~WindowMus() {}
 
   // Returns the WindowMus associated with |window|.
   static WindowMus* Get(Window* window);
 
   Id server_id() const { return server_id_; }
 
-  // Top level windows may have a root window with no associated server window.
-  // This happens because the client creates the top level window first, and
-  // then the WindowTreeHost. Each WindowTreeHost has a Window, so the
-  // WindowTreeHost for top-levels has no server window.
-  bool has_server_window() const { return server_id() != kInvalidServerId; }
-
-  // See constructor for details.
-  bool create_remote_window() const { return create_remote_window_; }
+  WindowMusType window_mus_type() const { return window_mus_type_; }
 
   virtual Window* GetWindow() = 0;
 
   // These functions are called in response to a change from the server. The
   // expectation is that in calling these WindowTreeClient is not called
   // back. For example, SetBoundsFromServer() should not result in calling back
   // to WindowTreeClient::OnWindowMusBoundsChanged().
   virtual void AddChildFromServer(WindowMus* window) = 0;
   virtual void RemoveChildFromServer(WindowMus* child) = 0;
   virtual void ReorderFromServer(WindowMus* child,
@@ skipping 25 matching lines @@
 
   virtual void NotifyEmbeddedAppDisconnected() = 0;
 
  private:
   // Just for set_server_id(), which other places should not call.
   friend class WindowTreeClient;
 
   void set_server_id(Id id) { server_id_ = id; }
 
   Id server_id_ = kInvalidServerId;
-  const bool create_remote_window_;
+  const WindowMusType window_mus_type_;
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_MUS_H_