| 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 ChangesToDescription1(connection3_->changes())[0]); | 526 ChangesToDescription1(connection3_->changes())[0]); |
| 527 } | 527 } |
| 528 | 528 |
| 529 void DestroySecondConnection() { | 529 void DestroySecondConnection() { |
| 530 connection2_->Destroy(); | 530 connection2_->Destroy(); |
| 531 connection2_ = NULL; | 531 connection2_ = NULL; |
| 532 } | 532 } |
| 533 | 533 |
| 534 base::ShadowingAtExitManager at_exit_; | 534 base::ShadowingAtExitManager at_exit_; |
| 535 shell::ShellTestHelper test_helper_; | 535 shell::ShellTestHelper test_helper_; |
| 536 base::MessageLoop loop_; | |
| 537 | 536 |
| 538 ViewManagerInitServicePtr view_manager_init_; | 537 ViewManagerInitServicePtr view_manager_init_; |
| 539 | 538 |
| 540 // NOTE: this connection is the root. As such, it has special permissions. | 539 // NOTE: this connection is the root. As such, it has special permissions. |
| 541 ViewManagerProxy* connection_; | 540 ViewManagerProxy* connection_; |
| 542 ViewManagerProxy* connection2_; | 541 ViewManagerProxy* connection2_; |
| 543 ViewManagerProxy* connection3_; | 542 ViewManagerProxy* connection3_; |
| 544 | 543 |
| 545 DISALLOW_COPY_AND_ASSIGN(ViewManagerTest); | 544 DISALLOW_COPY_AND_ASSIGN(ViewManagerTest); |
| 546 }; | 545 }; |
| (...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1462 // that SetBounsdNodes/AddNode and the like don't result in messages to the | 1461 // that SetBounsdNodes/AddNode and the like don't result in messages to the |
| 1463 // originating connection. | 1462 // originating connection. |
| 1464 | 1463 |
| 1465 // TODO(beng): Add tests for focus: | 1464 // TODO(beng): Add tests for focus: |
| 1466 // - focus between two nodes known to a connection | 1465 // - focus between two nodes known to a connection |
| 1467 // - focus between nodes unknown to one of the connections. | 1466 // - focus between nodes unknown to one of the connections. |
| 1468 // - focus between nodes unknown to either connection. | 1467 // - focus between nodes unknown to either connection. |
| 1469 | 1468 |
| 1470 } // namespace service | 1469 } // namespace service |
| 1471 } // namespace mojo | 1470 } // namespace mojo |
| OLD | NEW |