chromeos: wireup more display management for mushrome

ash/mus/bridge/shell_port_mash.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 ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
 #define ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
+#include "ash/display/window_tree_host_manager.h"
 #include "ash/shell_port.h"
 #include "base/macros.h"
 
 namespace aura {
 class WindowTreeClient;
 }
 
 namespace views {
 class PointerWatcherEventRouter;
 }
 
 namespace ash {
 
 class AcceleratorControllerDelegateAura;
 class PointerWatcherAdapter;
 class RootWindowController;
 
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class ImmersiveHandlerFactoryMus;
 class WindowManager;
 class ShellPortMashTestApi;
 
 // ShellPort implementation for mash/mus. See ash/README.md for more.
-class ShellPortMash : public ShellPort {
+class ShellPortMash : public ShellPort, public WindowTreeHostManager::Observer {
  public:
   // If |create_session_state_delegate_stub| is true SessionStateDelegateStub is
   // created. If false, the SessionStateDelegate from Shell is used.
   ShellPortMash(WmWindow* primary_root_window,
                 WindowManager* window_manager,
                 views::PointerWatcherEventRouter* pointer_watcher_event_router,
                 bool create_session_state_delegate_stub);
   ~ShellPortMash() override;
 
   static ShellPortMash* Get();
@@ skipping 81 matching lines @@
 
   struct MusSpecificState {
     MusSpecificState();
     ~MusSpecificState();
 
     std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter;
     std::unique_ptr<AcceleratorControllerDelegateAura>
         accelerator_controller_delegate;
   };
 
+  // WindowTreeHostManager::Observer:
+  void OnDisplayConfigurationChanging() override;
+  void OnDisplayConfigurationChanged() override;
+
   WindowManager* window_manager_;
 
   // TODO(sky): remove this once mash supports simple display management.
   WmWindow* primary_root_window_;
 
   // Only one of |mash_state_| or |mus_state_| is created, depending upon
   // Config.
   std::unique_ptr<MashSpecificState> mash_state_;
   std::unique_ptr<MusSpecificState> mus_state_;
 
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
+  bool added_display_observer_ = false;
+  base::ObserverList<WmDisplayObserver> display_observers_;
+
   DISALLOW_COPY_AND_ASSIGN(ShellPortMash);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_SHELL_PORT_MASH_H_