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 "mojo/services/public/cpp/view_manager/view_manager.h" | 5 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 | 385 |
386 void RunRunLoop() { | 386 void RunRunLoop() { |
387 base::RunLoop run_loop; | 387 base::RunLoop run_loop; |
388 connect_loop_ = &run_loop; | 388 connect_loop_ = &run_loop; |
389 connect_loop_->Run(); | 389 connect_loop_->Run(); |
390 connect_loop_ = NULL; | 390 connect_loop_ = NULL; |
391 } | 391 } |
392 | 392 |
393 base::RunLoop* connect_loop_; | 393 base::RunLoop* connect_loop_; |
394 shell::ShellTestHelper test_helper_; | 394 shell::ShellTestHelper test_helper_; |
395 base::MessageLoop loop_; | |
396 ViewManagerInitServicePtr view_manager_init_; | 395 ViewManagerInitServicePtr view_manager_init_; |
397 // Used to receive the most recent view manager loaded by an embed action. | 396 // Used to receive the most recent view manager loaded by an embed action. |
398 ViewManager* loaded_view_manager_; | 397 ViewManager* loaded_view_manager_; |
399 // The View Manager connection held by the window manager (app running at the | 398 // The View Manager connection held by the window manager (app running at the |
400 // root node). | 399 // root node). |
401 ViewManager* window_manager_; | 400 ViewManager* window_manager_; |
402 int commit_count_; | 401 int commit_count_; |
403 | 402 |
404 DISALLOW_COPY_AND_ASSIGN(ViewManagerTest); | 403 DISALLOW_COPY_AND_ASSIGN(ViewManagerTest); |
405 }; | 404 }; |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
670 | 669 |
671 // TODO(beng): tests for view event dispatcher. | 670 // TODO(beng): tests for view event dispatcher. |
672 // - verify that we see events for all views. | 671 // - verify that we see events for all views. |
673 | 672 |
674 // TODO(beng): tests for focus: | 673 // TODO(beng): tests for focus: |
675 // - focus between two nodes known to a connection | 674 // - focus between two nodes known to a connection |
676 // - focus between nodes unknown to one of the connections. | 675 // - focus between nodes unknown to one of the connections. |
677 // - focus between nodes unknown to either connection. | 676 // - focus between nodes unknown to either connection. |
678 | 677 |
679 } // namespace mojo | 678 } // namespace mojo |
OLD | NEW |