| 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 "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 tracker()->OnViewVisibilityChanged(view, visible); | 390 tracker()->OnViewVisibilityChanged(view, visible); |
| 391 } | 391 } |
| 392 void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { | 392 void OnViewDrawnStateChanged(uint32_t view, bool drawn) override { |
| 393 tracker()->OnViewDrawnStateChanged(view, drawn); | 393 tracker()->OnViewDrawnStateChanged(view, drawn); |
| 394 } | 394 } |
| 395 void OnViewInputEvent(Id view_id, | 395 void OnViewInputEvent(Id view_id, |
| 396 EventPtr event, | 396 EventPtr event, |
| 397 const Callback<void()>& callback) override { | 397 const Callback<void()>& callback) override { |
| 398 tracker()->OnViewInputEvent(view_id, event.Pass()); | 398 tracker()->OnViewInputEvent(view_id, event.Pass()); |
| 399 } | 399 } |
| 400 void OnViewPropertyChanged(uint32_t view, | 400 void OnViewSharedPropertyChanged(uint32_t view, |
| 401 const String& name, | 401 const String& name, |
| 402 Array<uint8_t> new_data) override { | 402 Array<uint8_t> new_data) override { |
| 403 tracker_.OnViewPropertyChanged(view, name, new_data.Pass()); | 403 tracker_.OnViewSharedPropertyChanged(view, name, new_data.Pass()); |
| 404 } | 404 } |
| 405 | 405 |
| 406 private: | 406 private: |
| 407 TestChangeTracker tracker_; | 407 TestChangeTracker tracker_; |
| 408 ViewManagerProxy proxy_; | 408 ViewManagerProxy proxy_; |
| 409 | 409 |
| 410 DISALLOW_COPY_AND_ASSIGN(TestViewManagerClientConnection); | 410 DISALLOW_COPY_AND_ASSIGN(TestViewManagerClientConnection); |
| 411 }; | 411 }; |
| 412 | 412 |
| 413 // Used with ViewManagerService::Embed(). Creates a | 413 // Used with ViewManagerService::Embed(). Creates a |
| (...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1602 EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL", | 1602 EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL", |
| 1603 ChangesToDescription1(connection2_->changes())[0]); | 1603 ChangesToDescription1(connection2_->changes())[0]); |
| 1604 } | 1604 } |
| 1605 } | 1605 } |
| 1606 | 1606 |
| 1607 // WARNING: this class is deprecated and will be replaced with | 1607 // WARNING: this class is deprecated and will be replaced with |
| 1608 // view_manager_server_apptest soonish. Add new tests there. | 1608 // view_manager_server_apptest soonish. Add new tests there. |
| 1609 | 1609 |
| 1610 } // namespace service | 1610 } // namespace service |
| 1611 } // namespace mojo | 1611 } // namespace mojo |
| OLD | NEW |