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/view_manager/view_manager_connection.h" | 5 #include "mojo/services/view_manager/view_manager_connection.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
15 #include "mojo/public/cpp/bindings/allocation_scope.h" | 15 #include "mojo/public/cpp/bindings/allocation_scope.h" |
16 #include "mojo/public/cpp/environment/environment.h" | 16 #include "mojo/public/cpp/environment/environment.h" |
17 #include "mojo/services/view_manager/root_node_manager.h" | 17 #include "mojo/services/view_manager/root_node_manager.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 18 #include "testing/gtest/include/gtest/gtest.h" |
19 | 19 |
20 namespace mojo { | 20 namespace mojo { |
21 namespace services { | 21 namespace services { |
22 namespace view_manager { | 22 namespace view_manager { |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 // TODO(sky): move ids.h into common place and include that. | |
27 typedef uint32_t ChangeId; | |
28 | |
29 base::RunLoop* current_run_loop = NULL; | 26 base::RunLoop* current_run_loop = NULL; |
30 | 27 |
31 // Sets |current_run_loop| and runs it. It is expected that someone else quits | 28 // Sets |current_run_loop| and runs it. It is expected that someone else quits |
32 // the loop. | 29 // the loop. |
33 void DoRunLoop() { | 30 void DoRunLoop() { |
34 base::RunLoop run_loop; | 31 base::RunLoop run_loop; |
35 current_run_loop = &run_loop; | 32 current_run_loop = &run_loop; |
36 current_run_loop->Run(); | 33 current_run_loop->Run(); |
37 current_run_loop = NULL; | 34 current_run_loop = NULL; |
38 } | 35 } |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
520 | 517 |
521 Changes changes(client_.GetAndClearChanges()); | 518 Changes changes(client_.GetAndClearChanges()); |
522 ASSERT_EQ(1u, changes.size()); | 519 ASSERT_EQ(1u, changes.size()); |
523 EXPECT_EQ("change_id=0 node=1,1 new_view=null old_view=2,51", changes[0]); | 520 EXPECT_EQ("change_id=0 node=1,1 new_view=null old_view=2,51", changes[0]); |
524 } | 521 } |
525 } | 522 } |
526 | 523 |
527 } // namespace view_manager | 524 } // namespace view_manager |
528 } // namespace services | 525 } // namespace services |
529 } // namespace mojo | 526 } // namespace mojo |
OLD | NEW |