| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_ | 5 #ifndef SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_ |
| 6 #define SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_ | 6 #define SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/atomicops.h" | 10 #include "base/atomicops.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 void AddObserver(mojom::DisplayManagerObserverPtr observer) override; | 60 void AddObserver(mojom::DisplayManagerObserverPtr observer) override; |
| 61 | 61 |
| 62 private: | 62 private: |
| 63 // Called when a new observer is added. If frame decorations are available | 63 // Called when a new observer is added. If frame decorations are available |
| 64 // notifies the observer immediately. | 64 // notifies the observer immediately. |
| 65 void OnObserverAdded(mojom::DisplayManagerObserver* observer); | 65 void OnObserverAdded(mojom::DisplayManagerObserver* observer); |
| 66 | 66 |
| 67 // Fills in a WsDisplayPtr for |display|. | 67 // Fills in a WsDisplayPtr for |display|. |
| 68 mojom::WsDisplayPtr GetWsDisplayPtr(const Display& display); | 68 mojom::WsDisplayPtr GetWsDisplayPtr(const Display& display); |
| 69 | 69 |
| 70 mojo::Array<mojom::WsDisplayPtr> GetAllDisplays(); | 70 std::vector<mojom::WsDisplayPtr> GetAllDisplays(); |
| 71 | 71 |
| 72 // Calls OnDisplays() on |observer|. | 72 // Calls OnDisplays() on |observer|. |
| 73 void CallOnDisplays(mojom::DisplayManagerObserver* observer); | 73 void CallOnDisplays(mojom::DisplayManagerObserver* observer); |
| 74 | 74 |
| 75 base::subtle::Atomic32* cursor_location_memory() { | 75 base::subtle::Atomic32* cursor_location_memory() { |
| 76 return reinterpret_cast<base::subtle::Atomic32*>( | 76 return reinterpret_cast<base::subtle::Atomic32*>( |
| 77 cursor_location_mapping_.get()); | 77 cursor_location_mapping_.get()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 ws::DisplayManager* display_manager_; | 80 ws::DisplayManager* display_manager_; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 106 // mojo connection, this data must be read atomically.) | 106 // mojo connection, this data must be read atomically.) |
| 107 mojo::ScopedSharedBufferMapping cursor_location_mapping_; | 107 mojo::ScopedSharedBufferMapping cursor_location_mapping_; |
| 108 | 108 |
| 109 DISALLOW_COPY_AND_ASSIGN(UserDisplayManager); | 109 DISALLOW_COPY_AND_ASSIGN(UserDisplayManager); |
| 110 }; | 110 }; |
| 111 | 111 |
| 112 } // namespace ws | 112 } // namespace ws |
| 113 } // namespace ui | 113 } // namespace ui |
| 114 | 114 |
| 115 #endif // SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_ | 115 #endif // SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_ |
| OLD | NEW |