Handle modified displays in mustash.

ash/mus/window_manager.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 ASH_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
+#include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 
 namespace base {
 class SequencedWorkerPool;
 }
 
 namespace display {
 class Display;
 class ScreenBase;
 }
@@ skipping 55 matching lines @@
   // Returns the next accelerator namespace id by value in |id|. Returns true
   // if there is another slot available, false if all slots are taken up.
   bool GetNextAcceleratorNamespaceId(uint16_t* id);
   void AddAcceleratorHandler(uint16_t id_namespace,
                              AcceleratorHandler* handler);
   void RemoveAcceleratorHandler(uint16_t id_namespace);
 
   void AddObserver(WindowManagerObserver* observer);
   void RemoveObserver(WindowManagerObserver* observer);
 
+  // Returns the DisplayController interface if available. Will be null if no
+  // service_manager::Connector was available, for example in some tests.
+  display::mojom::DisplayController* GetDisplayController();
+
  private:
   friend class WmTestHelper;
 
   using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>;
 
   RootWindowController* CreateRootWindowController(
       ui::Window* window,
       const display::Display& display);
 
   // Deletes the specified RootWindowController. Called when a display is
@@ skipping 30 matching lines @@
       ui::Window* window,
       const std::string& name,
       std::unique_ptr<std::vector<uint8_t>>* new_data) override;
   ui::Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
   void OnWmClientJankinessChanged(const std::set<ui::Window*>& client_windows,
                                   bool not_responding) override;
   void OnWmNewDisplay(ui::Window* window,
                       const display::Display& display) override;
   void OnWmDisplayRemoved(ui::Window* window) override;
+  void OnWmDisplayModified(const display::Display& display) override;
   void OnWmPerformMoveLoop(ui::Window* window,
                            ui::mojom::MoveLoopSource source,
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(ui::Window* window) override;
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
 
   service_manager::Connector* connector_;
+  display::mojom::DisplayControllerPtr display_controller_;
 
   std::unique_ptr<ui::WindowTreeClient> window_tree_client_;
 
   ui::WindowManagerClient* window_manager_client_ = nullptr;
 
   std::unique_ptr<views::PointerWatcherEventRouter>
       pointer_watcher_event_router_;
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
@@ skipping 10 matching lines @@
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_