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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
9 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
10 #include "mojo/public/cpp/application/application_test_base.h" | 10 #include "mojo/public/cpp/application/application_test_base.h" |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 void OnViewInputEvent(Id view_id, | 332 void OnViewInputEvent(Id view_id, |
333 EventPtr event, | 333 EventPtr event, |
334 const Callback<void()>& callback) override { | 334 const Callback<void()>& callback) override { |
335 tracker()->OnViewInputEvent(view_id, event.Pass()); | 335 tracker()->OnViewInputEvent(view_id, event.Pass()); |
336 } | 336 } |
337 void OnViewSharedPropertyChanged(uint32_t view, | 337 void OnViewSharedPropertyChanged(uint32_t view, |
338 const String& name, | 338 const String& name, |
339 Array<uint8_t> new_data) override { | 339 Array<uint8_t> new_data) override { |
340 tracker_.OnViewSharedPropertyChanged(view, name, new_data.Pass()); | 340 tracker_.OnViewSharedPropertyChanged(view, name, new_data.Pass()); |
341 } | 341 } |
| 342 void OnPerformAction(uint32_t view, |
| 343 const String& name, |
| 344 const Callback<void(bool)>& callback) override {} |
342 | 345 |
343 TestChangeTracker tracker_; | 346 TestChangeTracker tracker_; |
344 | 347 |
345 mojo::ViewManagerServicePtr service_; | 348 mojo::ViewManagerServicePtr service_; |
346 | 349 |
347 // If non-null we're waiting for OnEmbed() using this RunLoop. | 350 // If non-null we're waiting for OnEmbed() using this RunLoop. |
348 scoped_ptr<base::RunLoop> embed_run_loop_; | 351 scoped_ptr<base::RunLoop> embed_run_loop_; |
349 | 352 |
350 // If non-null we're waiting for a certain number of change notifications to | 353 // If non-null we're waiting for a certain number of change notifications to |
351 // be encountered. | 354 // be encountered. |
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1487 // TODO(sky): need to better track changes to initial connection. For example, | 1490 // TODO(sky): need to better track changes to initial connection. For example, |
1488 // that SetBounsdViews/AddView and the like don't result in messages to the | 1491 // that SetBounsdViews/AddView and the like don't result in messages to the |
1489 // originating connection. | 1492 // originating connection. |
1490 | 1493 |
1491 // TODO(sky): make sure coverage of what was | 1494 // TODO(sky): make sure coverage of what was |
1492 // ViewManagerTest.SecondEmbedRoot_InitService and | 1495 // ViewManagerTest.SecondEmbedRoot_InitService and |
1493 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager | 1496 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager |
1494 // tests. | 1497 // tests. |
1495 | 1498 |
1496 } // namespace view_manager | 1499 } // namespace view_manager |
OLD | NEW |