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 // This has to be before any other includes, else default is picked up. | 5 // This has to be before any other includes, else default is picked up. |
6 // See base/logging for details on this. | 6 // See base/logging for details on this. |
7 #define NOTIMPLEMENTED_POLICY 5 | 7 #define NOTIMPLEMENTED_POLICY 5 |
8 | 8 |
9 #include "ui/views/mus/screen_mus.h" | 9 #include "ui/views/mus/screen_mus.h" |
10 | 10 |
(...skipping 23 matching lines...) Expand all Loading... |
34 | 34 |
35 namespace views { | 35 namespace views { |
36 | 36 |
37 ScreenMus::ScreenMus(ScreenMusDelegate* delegate) | 37 ScreenMus::ScreenMus(ScreenMusDelegate* delegate) |
38 : delegate_(delegate), | 38 : delegate_(delegate), |
39 display_manager_observer_binding_(this) { | 39 display_manager_observer_binding_(this) { |
40 } | 40 } |
41 | 41 |
42 ScreenMus::~ScreenMus() {} | 42 ScreenMus::~ScreenMus() {} |
43 | 43 |
44 void ScreenMus::Init(shell::Connector* connector) { | 44 void ScreenMus::Init(service_manager::Connector* connector) { |
45 connector->ConnectToInterface("service:ui", &display_manager_); | 45 connector->ConnectToInterface("service:ui", &display_manager_); |
46 | 46 |
47 display_manager_->AddObserver( | 47 display_manager_->AddObserver( |
48 display_manager_observer_binding_.CreateInterfacePtrAndBind()); | 48 display_manager_observer_binding_.CreateInterfacePtrAndBind()); |
49 | 49 |
50 // We need the set of displays before we can continue. Wait for it. | 50 // We need the set of displays before we can continue. Wait for it. |
51 // | 51 // |
52 // TODO(rockot): Do something better here. This should not have to block tasks | 52 // TODO(rockot): Do something better here. This should not have to block tasks |
53 // from running on the calling thread. http://crbug.com/594852. | 53 // from running on the calling thread. http://crbug.com/594852. |
54 bool success = display_manager_observer_binding_.WaitForIncomingMethodCall(); | 54 bool success = display_manager_observer_binding_.WaitForIncomingMethodCall(); |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 delegate_->OnWindowManagerFrameValuesChanged(); | 130 delegate_->OnWindowManagerFrameValuesChanged(); |
131 } | 131 } |
132 } | 132 } |
133 } | 133 } |
134 | 134 |
135 void ScreenMus::OnDisplayRemoved(int64_t id) { | 135 void ScreenMus::OnDisplayRemoved(int64_t id) { |
136 display_list()->RemoveDisplay(id); | 136 display_list()->RemoveDisplay(id); |
137 } | 137 } |
138 | 138 |
139 } // namespace views | 139 } // namespace views |
OLD | NEW |