| 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 #include <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 PlatformDisplay::set_factory_for_testing(&platform_display_factory_); | 117 PlatformDisplay::set_factory_for_testing(&platform_display_factory_); |
| 118 window_server_.reset(new WindowServer(&window_server_delegate_, | 118 window_server_.reset(new WindowServer(&window_server_delegate_, |
| 119 scoped_refptr<SurfacesState>())); | 119 scoped_refptr<SurfacesState>())); |
| 120 window_server_delegate_.set_window_server(window_server_.get()); | 120 window_server_delegate_.set_window_server(window_server_.get()); |
| 121 } | 121 } |
| 122 | 122 |
| 123 protected: | 123 protected: |
| 124 int32_t cursor_id_; | 124 int32_t cursor_id_; |
| 125 TestPlatformDisplayFactory platform_display_factory_; | 125 TestPlatformDisplayFactory platform_display_factory_; |
| 126 TestWindowServerDelegate window_server_delegate_; | 126 TestWindowServerDelegate window_server_delegate_; |
| 127 scoped_ptr<WindowServer> window_server_; | 127 std::unique_ptr<WindowServer> window_server_; |
| 128 base::MessageLoop message_loop_; | 128 base::MessageLoop message_loop_; |
| 129 TestWindowManagerFactory test_window_manager_factory_; | 129 TestWindowManagerFactory test_window_manager_factory_; |
| 130 | 130 |
| 131 DISALLOW_COPY_AND_ASSIGN(UserDisplayManagerTest); | 131 DISALLOW_COPY_AND_ASSIGN(UserDisplayManagerTest); |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 TEST_F(UserDisplayManagerTest, OnlyNotifyWhenFrameDecorationsSet) { | 134 TEST_F(UserDisplayManagerTest, OnlyNotifyWhenFrameDecorationsSet) { |
| 135 window_server_delegate_.set_num_displays_to_create(1); | 135 window_server_delegate_.set_num_displays_to_create(1); |
| 136 | 136 |
| 137 const UserId kUserId1 = "2"; | 137 const UserId kUserId1 = "2"; |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 display2 = nullptr; | 223 display2 = nullptr; |
| 224 EXPECT_EQ("OnDisplayRemoved 2", | 224 EXPECT_EQ("OnDisplayRemoved 2", |
| 225 display_manager_observer1.GetAndClearObserverCalls()); | 225 display_manager_observer1.GetAndClearObserverCalls()); |
| 226 | 226 |
| 227 UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr); | 227 UserDisplayManagerTestApi(user_display_manager1).SetTestObserver(nullptr); |
| 228 } | 228 } |
| 229 | 229 |
| 230 } // namespace test | 230 } // namespace test |
| 231 } // namespace ws | 231 } // namespace ws |
| 232 } // namespace mus | 232 } // namespace mus |
| OLD | NEW |