Moves FrameDecorations from Display to WindowManagerState

components/mus/ws/user_display_manager.h

Index: components/mus/ws/user_display_manager.h
diff --git a/components/mus/ws/user_display_manager.h b/components/mus/ws/user_display_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..c17a7c6981a155821d53159ac3482e8ddaedc8ad
--- /dev/null
+++ b/components/mus/ws/user_display_manager.h
@@ -0,0 +1,83 @@
+// 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 COMPONENTS_MUS_WS_USER_DISPLAY_MANAGER_H_
+#define COMPONENTS_MUS_WS_USER_DISPLAY_MANAGER_H_
+
+#include <set>
+
+#include "base/macros.h"
+#include "components/mus/public/interfaces/display.mojom.h"
+#include "components/mus/ws/user_id.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/interface_ptr_set.h"
+
+namespace mus {
+namespace ws {
+
+class Display;
+class DisplayManager;
+class WindowManagerState;
+
+namespace test {
+class UserDisplayManagerTestApi;
+}
+
+// Provides per user display state.
+class UserDisplayManager : public mojom::DisplayManager {
+ public:
+  UserDisplayManager(ws::DisplayManager* display_manager,
+                     const UserId& user_id);
+  ~UserDisplayManager() override;
+
+  void OnFrameDecorationValuesChanged(WindowManagerState* wms);
+
+  void AddDisplayManagerBinding(
+      mojo::InterfaceRequest<mojom::DisplayManager> request);
+
+  // Called by Display prior to |display| being removed and destroyed.
+  void OnWillDestroyDisplay(Display* display);
+
+ private:
+  friend class test::UserDisplayManagerTestApi;
+
+  // Returns the WindowManagerStates for the associated user that have frame
+  // decoration values.
+  std::set<const WindowManagerState*> GetWindowManagerStatesForUser() const;
+
+  void OnObserverAdded(mojom::DisplayManagerObserver* observer);
+
+  // Calls OnDisplays() on |observer|.
+  void CallOnDisplays(mojom::DisplayManagerObserver* observer);
+
+  // Calls observer->OnDisplaysChanged() with the display for |display|.
+  void CallOnDisplayChanged(WindowManagerState* wms,
+                            mojom::DisplayManagerObserver* observer);
+
+  // Overriden from mojom::DisplayManager:
+  void AddObserver(mojom::DisplayManagerObserverPtr observer) override;
+
+  ws::DisplayManager* display_manager_;
+
+  const UserId user_id_;
+
+  // Set to true the first time at least one Display has valid frame values.
+  bool got_valid_frame_decorations_ = false;
+
+  mojo::BindingSet<mojom::DisplayManager> display_manager_bindings_;
+
+  // WARNING: only use these once |got_valid_frame_decorations_| is true.
+  mojo::InterfacePtrSet<mojom::DisplayManagerObserver>
+      display_manager_observers_;
+
+  // Observer used for tests.
+  mojom::DisplayManagerObserver* test_observer_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(UserDisplayManager);
+};
+
+}  // namespace ws
+}  // namespace mus
+
+#endif  // COMPONENTS_MUS_WS_USER_DISPLAY_MANAGER_H_