| 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 UI_VIEWS_MUS_SCREEN_MUS_H_ | 5 #ifndef UI_VIEWS_MUS_SCREEN_MUS_H_ |
| 6 #define UI_VIEWS_MUS_SCREEN_MUS_H_ | 6 #define UI_VIEWS_MUS_SCREEN_MUS_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| 11 #include "base/run_loop.h" |
| 11 #include "components/mus/public/interfaces/display.mojom.h" | 12 #include "components/mus/public/interfaces/display.mojom.h" |
| 12 #include "mojo/public/cpp/bindings/binding.h" | 13 #include "mojo/public/cpp/bindings/binding.h" |
| 13 #include "ui/gfx/display.h" | 14 #include "ui/gfx/display.h" |
| 14 #include "ui/gfx/screen.h" | 15 #include "ui/gfx/screen.h" |
| 15 #include "ui/views/mus/mus_export.h" | 16 #include "ui/views/mus/mus_export.h" |
| 16 | 17 |
| 17 namespace mojo { | 18 namespace mojo { |
| 18 class Connector; | 19 class Connector; |
| 19 } | 20 } |
| 20 | 21 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 void OnDisplaysChanged(mojo::Array<mus::mojom::DisplayPtr> display) override; | 59 void OnDisplaysChanged(mojo::Array<mus::mojom::DisplayPtr> display) override; |
| 59 void OnDisplayRemoved(int64_t id) override; | 60 void OnDisplayRemoved(int64_t id) override; |
| 60 | 61 |
| 61 ScreenMusDelegate* delegate_; | 62 ScreenMusDelegate* delegate_; |
| 62 mus::mojom::DisplayManagerPtr display_manager_; | 63 mus::mojom::DisplayManagerPtr display_manager_; |
| 63 std::vector<gfx::Display> displays_; | 64 std::vector<gfx::Display> displays_; |
| 64 int primary_display_index_; | 65 int primary_display_index_; |
| 65 mojo::Binding<mus::mojom::DisplayManagerObserver> | 66 mojo::Binding<mus::mojom::DisplayManagerObserver> |
| 66 display_manager_observer_binding_; | 67 display_manager_observer_binding_; |
| 67 base::ObserverList<gfx::DisplayObserver> observers_; | 68 base::ObserverList<gfx::DisplayObserver> observers_; |
| 69 scoped_ptr<base::RunLoop> wait_for_displays_loop_; |
| 68 | 70 |
| 69 DISALLOW_COPY_AND_ASSIGN(ScreenMus); | 71 DISALLOW_COPY_AND_ASSIGN(ScreenMus); |
| 70 }; | 72 }; |
| 71 | 73 |
| 72 } // namespace views | 74 } // namespace views |
| 73 | 75 |
| 74 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_ | 76 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_ |
| OLD | NEW |