| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 DISALLOW_COPY_AND_ASSIGN(TestDisplayManager); | 345 DISALLOW_COPY_AND_ASSIGN(TestDisplayManager); |
| 346 }; | 346 }; |
| 347 | 347 |
| 348 // Factory that dispenses TestDisplayManagers. | 348 // Factory that dispenses TestDisplayManagers. |
| 349 class TestDisplayManagerFactory : public DisplayManagerFactory { | 349 class TestDisplayManagerFactory : public DisplayManagerFactory { |
| 350 public: | 350 public: |
| 351 explicit TestDisplayManagerFactory(int32_t* cursor_id_storage) | 351 explicit TestDisplayManagerFactory(int32_t* cursor_id_storage) |
| 352 : cursor_id_storage_(cursor_id_storage) {} | 352 : cursor_id_storage_(cursor_id_storage) {} |
| 353 ~TestDisplayManagerFactory() {} | 353 ~TestDisplayManagerFactory() {} |
| 354 DisplayManager* CreateDisplayManager( | 354 DisplayManager* CreateDisplayManager( |
| 355 mojo::Shell* shell, | 355 mojo::Connector* connector, |
| 356 const scoped_refptr<GpuState>& gpu_state, | 356 const scoped_refptr<GpuState>& gpu_state, |
| 357 const scoped_refptr<mus::SurfacesState>& surfaces_state) override { | 357 const scoped_refptr<mus::SurfacesState>& surfaces_state) override { |
| 358 return new TestDisplayManager(cursor_id_storage_); | 358 return new TestDisplayManager(cursor_id_storage_); |
| 359 } | 359 } |
| 360 | 360 |
| 361 private: | 361 private: |
| 362 int32_t* cursor_id_storage_; | 362 int32_t* cursor_id_storage_; |
| 363 | 363 |
| 364 DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerFactory); | 364 DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerFactory); |
| 365 }; | 365 }; |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 mojom_window_tree->ReleaseCapture(++change_id, | 940 mojom_window_tree->ReleaseCapture(++change_id, |
| 941 WindowIdToTransportId(root_window->id())); | 941 WindowIdToTransportId(root_window->id())); |
| 942 EXPECT_EQ(window, host->GetCaptureWindow()); | 942 EXPECT_EQ(window, host->GetCaptureWindow()); |
| 943 mojom_window_tree->ReleaseCapture(++change_id, | 943 mojom_window_tree->ReleaseCapture(++change_id, |
| 944 WindowIdToTransportId(window->id())); | 944 WindowIdToTransportId(window->id())); |
| 945 EXPECT_EQ(nullptr, host->GetCaptureWindow()); | 945 EXPECT_EQ(nullptr, host->GetCaptureWindow()); |
| 946 } | 946 } |
| 947 | 947 |
| 948 } // namespace ws | 948 } // namespace ws |
| 949 } // namespace mus | 949 } // namespace mus |
| OLD | NEW |