WIP: simplified display management in ash

ui/aura/mus/window_tree_host_mus.h

 // Copyright 2015 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_HOST_MUS_H_
 #define UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 61 matching lines @@
   // Tells the window manager to take control of moving the window. Returns
   // true if the move wasn't canceled.
   void PerformWindowMove(ui::mojom::MoveLoopSource mus_source,
                          const gfx::Point& cursor_location,
                          const base::Callback<void(bool)>& callback);
 
   // Tells the window manager to abort any current move initiated by
   // PerformWindowMove().
   void CancelWindowMove();
 
+  ui::mojom::WmViewportMetricsPtr ReleaseInitialMetrics();
+  std::unique_ptr<display::Display> ReleaseInitialDisplay();
+
   // Intended only for WindowTreeClient to call.
   void set_display_id(int64_t id) { display_id_ = id; }
   int64_t display_id() const { return display_id_; }
   display::Display GetDisplay() const;
 
   // aura::WindowTreeHostPlatform:
   void HideImpl() override;
   void SetBoundsInPixels(const gfx::Rect& bounds) override;
   void DispatchEvent(ui::Event* event) override;
   void OnClosed() override;
   void OnActivationChanged(bool active) override;
   void OnCloseRequest() override;
   gfx::ICCProfile GetICCProfileForCurrentDisplay() override;
   void MoveCursorToScreenLocationInPixels(
       const gfx::Point& location_in_pixels) override;
 
  private:
   int64_t display_id_;
 
   WindowTreeHostMusDelegate* delegate_;
 
   bool in_set_bounds_from_server_ = false;
 
   std::unique_ptr<InputMethodMus> input_method_;
 
+  ui::mojom::WmViewportMetricsPtr initial_metrics_;
+  std::unique_ptr<display::Display> initial_display_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_TREE_HOST_MUS_H_