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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "mojo/common/common_type_converters.h" | 8 #include "mojo/common/common_type_converters.h" |
9 #include "mojo/converters/geometry/geometry_type_converters.h" | 9 #include "mojo/converters/geometry/geometry_type_converters.h" |
10 #include "mojo/public/interfaces/application/service_provider.mojom.h" | 10 #include "mojo/public/interfaces/application/service_provider.mojom.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 OrderDirection direction) override { | 66 OrderDirection direction) override { |
67 tracker_.OnViewReordered(view_id, relative_view_id, direction); | 67 tracker_.OnViewReordered(view_id, relative_view_id, direction); |
68 } | 68 } |
69 void OnViewDeleted(uint32_t view) override { tracker_.OnViewDeleted(view); } | 69 void OnViewDeleted(uint32_t view) override { tracker_.OnViewDeleted(view); } |
70 void OnViewVisibilityChanged(uint32_t view, bool visible) override { | 70 void OnViewVisibilityChanged(uint32_t view, bool visible) override { |
71 tracker_.OnViewVisibilityChanged(view, visible); | 71 tracker_.OnViewVisibilityChanged(view, visible); |
72 } | 72 } |
73 void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { | 73 void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { |
74 tracker_.OnViewDrawnStateChanged(view, drawn); | 74 tracker_.OnViewDrawnStateChanged(view, drawn); |
75 } | 75 } |
76 void OnViewPropertyChanged(uint32_t view, | 76 void OnViewSharedPropertyChanged(uint32_t view, |
77 const String& name, | 77 const String& name, |
78 Array<uint8_t> new_data) override { | 78 Array<uint8_t> new_data) override { |
79 tracker_.OnViewPropertyChanged(view, name, new_data.Pass()); | 79 tracker_.OnViewSharedPropertyChanged(view, name, new_data.Pass()); |
80 } | 80 } |
81 void OnViewInputEvent(uint32_t view, | 81 void OnViewInputEvent(uint32_t view, |
82 EventPtr event, | 82 EventPtr event, |
83 const Callback<void()>& callback) override { | 83 const Callback<void()>& callback) override { |
84 tracker_.OnViewInputEvent(view, event.Pass()); | 84 tracker_.OnViewInputEvent(view, event.Pass()); |
85 } | 85 } |
86 | 86 |
87 TestChangeTracker tracker_; | 87 TestChangeTracker tracker_; |
88 | 88 |
89 DISALLOW_COPY_AND_ASSIGN(TestViewManagerClient); | 89 DISALLOW_COPY_AND_ASSIGN(TestViewManagerClient); |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceTest); | 219 DISALLOW_COPY_AND_ASSIGN(ViewManagerServiceTest); |
220 }; | 220 }; |
221 | 221 |
222 TEST_F(ViewManagerServiceTest, Basic) { | 222 TEST_F(ViewManagerServiceTest, Basic) { |
223 wm_connection()->CreateView(ViewId(wm_connection()->id(), 1)); | 223 wm_connection()->CreateView(ViewId(wm_connection()->id(), 1)); |
224 ASSERT_EQ(1u, wm_client_->tracker()->changes()->size()); | 224 ASSERT_EQ(1u, wm_client_->tracker()->changes()->size()); |
225 } | 225 } |
226 | 226 |
227 } // namespace service | 227 } // namespace service |
228 } // namespace mojo | 228 } // namespace mojo |
OLD | NEW |