| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 tracker()->OnViewVisibilityChanged(view, visible); | 258 tracker()->OnViewVisibilityChanged(view, visible); |
| 259 } | 259 } |
| 260 void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { | 260 void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { |
| 261 tracker()->OnViewDrawnStateChanged(view, drawn); | 261 tracker()->OnViewDrawnStateChanged(view, drawn); |
| 262 } | 262 } |
| 263 void OnViewInputEvent(Id view_id, | 263 void OnViewInputEvent(Id view_id, |
| 264 EventPtr event, | 264 EventPtr event, |
| 265 const Callback<void()>& callback) override { | 265 const Callback<void()>& callback) override { |
| 266 tracker()->OnViewInputEvent(view_id, event.Pass()); | 266 tracker()->OnViewInputEvent(view_id, event.Pass()); |
| 267 } | 267 } |
| 268 void OnViewPropertyChanged(uint32_t view, | 268 void OnViewSharedPropertyChanged(uint32_t view, |
| 269 const String& name, | 269 const String& name, |
| 270 Array<uint8_t> new_data) override { | 270 Array<uint8_t> new_data) override { |
| 271 tracker_.OnViewPropertyChanged(view, name, new_data.Pass()); | 271 tracker_.OnViewSharedPropertyChanged(view, name, new_data.Pass()); |
| 272 } | 272 } |
| 273 | 273 |
| 274 TestChangeTracker tracker_; | 274 TestChangeTracker tracker_; |
| 275 | 275 |
| 276 // Whether OnEmbed() has been encountered. | 276 // Whether OnEmbed() has been encountered. |
| 277 bool got_embed_; | 277 bool got_embed_; |
| 278 | 278 |
| 279 // If non-null we're waiting for OnEmbed() using this RunLoop. | 279 // If non-null we're waiting for OnEmbed() using this RunLoop. |
| 280 scoped_ptr<base::RunLoop> embed_run_loop_; | 280 scoped_ptr<base::RunLoop> embed_run_loop_; |
| 281 | 281 |
| (...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1328 // that SetBounsdViews/AddView and the like don't result in messages to the | 1328 // that SetBounsdViews/AddView and the like don't result in messages to the |
| 1329 // originating connection. | 1329 // originating connection. |
| 1330 | 1330 |
| 1331 // TODO(sky): make sure coverage of what was | 1331 // TODO(sky): make sure coverage of what was |
| 1332 // ViewManagerTest.SecondEmbedRoot_InitService and | 1332 // ViewManagerTest.SecondEmbedRoot_InitService and |
| 1333 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager | 1333 // ViewManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window manager |
| 1334 // tests. | 1334 // tests. |
| 1335 | 1335 |
| 1336 } // namespace service | 1336 } // namespace service |
| 1337 } // namespace mojo | 1337 } // namespace mojo |
| OLD | NEW |