Fixes to WindowTreeHostMus

ui/aura/mus/window_tree_client.h

 // Copyright 2014 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_TREE_CLIENT_H_
 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/client/capture_client_observer.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/mus/mus_types.h"
 #include "ui/aura/mus/window_manager_delegate.h"
+#include "ui/aura/mus/window_tree_host_mus_delegate.h"
 
 namespace display {
 class Display;
 }
 
 namespace gfx {
 class Insets;
 }
 
 namespace service_manager {
 class Connector;
 }
 
 namespace aura {
+class InFlightBoundsChange;
 class InFlightCaptureChange;
 class InFlightChange;
 class InFlightFocusChange;
 class InFlightPropertyChange;
+class InFlightVisibleChange;
 class WindowMus;
 class WindowPortMus;
 struct WindowPortInitData;
 struct WindowPortPropertyData;
 class WindowTreeClientDelegate;
 class WindowTreeClientPrivate;
 class WindowTreeClientObserver;
 class WindowTreeHost;
 
 namespace client {
 class FocusClient;
 }
 
 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>;
 
 // Manages the connection with mus.
 //
 // WindowTreeClient is owned by the creator. Generally when the delegate gets
 // one of OnEmbedRootDestroyed() or OnLostConnection() it should delete the
 // WindowTreeClient.
 //
 // When WindowTreeClient is deleted all windows are deleted (and observers
 // notified).
 class AURA_EXPORT WindowTreeClient
     : NON_EXPORTED_BASE(public ui::mojom::WindowTreeClient),
       NON_EXPORTED_BASE(public ui::mojom::WindowManager),
       public WindowManagerClient,
       public client::CaptureClientObserver,
-      public client::FocusChangeObserver {
+      public client::FocusChangeObserver,
+      public WindowTreeHostMusDelegate {
  public:
   explicit WindowTreeClient(
       WindowTreeClientDelegate* delegate,
       WindowManagerDelegate* window_manager_delegate = nullptr,
       ui::mojom::WindowTreeClientRequest request = nullptr);
   ~WindowTreeClient() override;
 
   // Establishes the connection by way of the WindowTreeFactory.
   void ConnectViaWindowTreeFactory(service_manager::Connector* connector);
 
@@ skipping 81 matching lines @@
                          const base::Callback<void(bool)>& callback);
 
   // Cancels a in progress window move. (If no window is currently being moved,
   // does nothing.)
   void CancelWindowMove(Window* window);
 
   void AddObserver(WindowTreeClientObserver* observer);
   void RemoveObserver(WindowTreeClientObserver* observer);
 
  private:
+  friend class InFlightBoundsChange;
   friend class InFlightCaptureChange;
   friend class InFlightFocusChange;
   friend class InFlightPropertyChange;
+  friend class InFlightVisibleChange;
   friend class WindowPortMus;
   friend class WindowTreeClientPrivate;
 
-  enum class WindowTreeHostType { EMBED, TOP_LEVEL, DISPLAY };
-
   struct CurrentDragState;
 
   using IdToWindowMap = std::map<Id, WindowMus*>;
 
   // TODO(sky): this assumes change_ids never wrap, which is a bad assumption.
   using InFlightMap = std::map<uint32_t, std::unique_ptr<InFlightChange>>;
 
   void RegisterWindowMus(WindowMus* window);
 
   WindowMus* GetWindowByServerId(Id id);
@@ skipping 31 matching lines @@
   void SetLocalPropertiesFromServerProperties(
       WindowMus* window,
       const ui::mojom::WindowDataPtr& window_data);
 
   // Creates a WindowTreeHostMus and returns the window associated with it.
   // The returned window is either the content window of the WindowTreeHostMus
   // or the window created by WindowTreeHost. See WindowTreeHostMus for
   // details.
   // TODO(sky): it would be nice to always have a single window and not the
   // two different. That requires ownership changes to WindowTreeHost though.
-  Window* CreateWindowTreeHost(WindowTreeHostType type,
+  Window* CreateWindowTreeHost(RootWindowType type,
                                const ui::mojom::WindowDataPtr& window_data,
+                               int64_t display_id,
                                Window* content_window);
 
   WindowMus* NewWindowFromWindowData(
       WindowMus* parent,
       const ui::mojom::WindowDataPtr& window_data);
 
   // Sets the ui::mojom::WindowTree implementation.
   void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr);
 
   // Called when the ui::mojom::WindowTree connection is lost, deletes this.
@@ skipping 14 matching lines @@
   // Called by WmNewDisplayAdded().
   WindowTreeHost* WmNewDisplayAddedImpl(const display::Display& display,
                                         ui::mojom::WindowDataPtr root_data,
                                         bool parent_drawn);
 
   std::unique_ptr<EventResultCallback> CreateEventResultCallback(
       int32_t event_id);
 
   void OnReceivedCursorLocationMemory(mojo::ScopedSharedBufferHandle handle);
 
+  // Called when a property needs to change as the result of a change in the
+  // server, or the server failing to accept a change.
+  void SetWindowBoundsFromServer(WindowMus* window,
+                                 const gfx::Rect& revert_bounds);
+  void SetWindowVisibleFromServer(WindowMus* window, bool visible);
+
   // Following are called from WindowMus.
   std::unique_ptr<WindowPortInitData> OnWindowMusCreated(WindowMus* window);
   void OnWindowMusInitDone(WindowMus* window,
                            std::unique_ptr<WindowPortInitData> init_data);
   void OnWindowMusDestroyed(WindowMus* window);
   void OnWindowMusBoundsChanged(WindowMus* window,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void OnWindowMusAddChild(WindowMus* parent, WindowMus* child);
   void OnWindowMusRemoveChild(WindowMus* parent, WindowMus* child);
@@ skipping 142 matching lines @@
       Window* window,
       const gfx::Vector2d& offset,
       const gfx::Insets& hit_area) override;
 
   // Overriden from client::FocusChangeObserver:
   void OnWindowFocused(Window* gained_focus, Window* lost_focus) override;
 
   // Overriden from client::CaptureClientObserver:
   void OnCaptureChanged(Window* lost_capture, Window* gained_capture) override;
 
+  // Overriden from WindowTreeHostMusDelegate:
+  void SetRootWindowBounds(Window* window, gfx::Rect* bounds) override;
+
   // The one int in |cursor_location_mapping_|. When we read from this
   // location, we must always read from it atomically.
   base::subtle::Atomic32* cursor_location_memory() {
     return reinterpret_cast<base::subtle::Atomic32*>(
         cursor_location_mapping_.get());
   }
 
   // This is set once and only once when we get OnEmbed(). It gives the unique
   // id for this client.
   ClientSpecificId client_id_;
@@ skipping 70 matching lines @@
   std::set<Id> drag_entered_windows_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_