Handle modified displays in mustash.

services/ui/ws/display.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 SERVICES_UI_WS_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 64 matching lines @@
   // Returns a mojom::WsDisplay for the specified display. WindowManager
   // specific values are not set.
   mojom::WsDisplayPtr ToWsDisplay() const;
 
   // Returns a display::Display for the specficied display.
   display::Display ToDisplay() const;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds);
 
-  display::Display::Rotation GetRotation() const;
   gfx::Size GetSize() const;
 
   WindowServer* window_server() { return window_server_; }
 
   // Returns the root of the Display. The root's children are the roots
   // of the corresponding WindowManagers.
   ServerWindow* root_window() { return root_.get(); }
   const ServerWindow* root_window() const { return root_.get(); }
 
   // Returns the ServerWindow whose id is |id|. This does not do a search over
@@ skipping 42 matching lines @@
 
   // Called just before |tree| is destroyed.
   void OnWillDestroyTree(WindowTree* tree);
 
   void UpdateNativeCursor(mojom::Cursor cursor_id);
 
   // mojom::WindowTreeHost:
   void SetSize(const gfx::Size& size) override;
   void SetTitle(const mojo::String& title) override;
 
+  // Updates the root window, if necessary, for viewport metric changes.
+  void OnViewportMetricsChanged(const display::ViewportMetrics& new_metrics);
+
  private:
   friend class test::DisplayTestApi;
 
   using WindowManagerDisplayRootMap =
       std::map<UserId, WindowManagerDisplayRoot*>;
 
   // Inits the necessary state once the display is ready.
   void InitWindowManagerDisplayRootsIfNecessary();
 
   // Creates the set of WindowManagerDisplayRoots from the
   // WindowManagerWindowTreeFactorySet.
   void CreateWindowManagerDisplayRootsFromFactories();
 
   void CreateWindowManagerDisplayRootFromFactory(
       WindowManagerWindowTreeFactory* factory);
 
   // PlatformDisplayDelegate:
   void CreateRootWindow(const gfx::Size& size) override;
   ServerWindow* GetRootWindow() override;
   bool IsInHighContrastMode() override;
   void OnEvent(const ui::Event& event) override;
   void OnNativeCaptureLost() override;
-  void OnViewportMetricsChanged(const ViewportMetrics& old_metrics,
-                                const ViewportMetrics& new_metrics) override;
 
   // FocusControllerDelegate:
   bool CanHaveActiveChildren(ServerWindow* window) const override;
 
   // FocusControllerObserver:
   void OnActivationChanged(ServerWindow* old_active_window,
                            ServerWindow* new_active_window) override;
   void OnFocusChanged(FocusControllerChangeSource change_source,
                       ServerWindow* old_focused_window,
                       ServerWindow* new_focused_window) override;
@@ skipping 20 matching lines @@
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_