| 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/atomicops.h" | 9 #include "base/atomicops.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 void OnDisplayRemoved(int64_t id) override { | 74 void OnDisplayRemoved(int64_t id) override { |
| 75 AddCall("OnDisplayRemoved " + base::Int64ToString(id)); | 75 AddCall("OnDisplayRemoved " + base::Int64ToString(id)); |
| 76 } | 76 } |
| 77 | 77 |
| 78 std::string observer_calls_; | 78 std::string observer_calls_; |
| 79 | 79 |
| 80 DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerObserver); | 80 DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerObserver); |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 mojom::FrameDecorationValuesPtr CreateDefaultFrameDecorationValues() { | 83 mojom::FrameDecorationValuesPtr CreateDefaultFrameDecorationValues() { |
| 84 mojom::FrameDecorationValuesPtr frame_decoration_values = | 84 return mojom::FrameDecorationValues::New(); |
| 85 mojom::FrameDecorationValues::New(); | |
| 86 frame_decoration_values->normal_client_area_insets = mojo::Insets::New(); | |
| 87 frame_decoration_values->maximized_client_area_insets = mojo::Insets::New(); | |
| 88 return frame_decoration_values; | |
| 89 } | 85 } |
| 90 | 86 |
| 91 } // namespace | 87 } // namespace |
| 92 | 88 |
| 93 // ----------------------------------------------------------------------------- | 89 // ----------------------------------------------------------------------------- |
| 94 | 90 |
| 95 class UserDisplayManagerTest : public testing::Test { | 91 class UserDisplayManagerTest : public testing::Test { |
| 96 public: | 92 public: |
| 97 UserDisplayManagerTest() | 93 UserDisplayManagerTest() |
| 98 : cursor_id_(0), platform_display_factory_(&cursor_id_) {} | 94 : cursor_id_(0), platform_display_factory_(&cursor_id_) {} |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 base::subtle::Atomic32 location = | 239 base::subtle::Atomic32 location = |
| 244 base::subtle::NoBarrier_Load(cursor_location_memory); | 240 base::subtle::NoBarrier_Load(cursor_location_memory); |
| 245 EXPECT_EQ(gfx::Point(static_cast<int16_t>(location >> 16), | 241 EXPECT_EQ(gfx::Point(static_cast<int16_t>(location >> 16), |
| 246 static_cast<int16_t>(location & 0xFFFF)), | 242 static_cast<int16_t>(location & 0xFFFF)), |
| 247 gfx::Point(-10, -11)); | 243 gfx::Point(-10, -11)); |
| 248 } | 244 } |
| 249 | 245 |
| 250 } // namespace test | 246 } // namespace test |
| 251 } // namespace ws | 247 } // namespace ws |
| 252 } // namespace mus | 248 } // namespace mus |
| OLD | NEW |