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/lib/view_manager_synchronizer.h" | 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "mojo/public/cpp/shell/service.h" | 9 #include "mojo/public/cpp/bindings/allocation_scope.h" |
darin (slow to review)
2014/05/12 22:04:52
nit: allocation scope does not appear to be needed
DaveMoore
2014/05/14 16:50:31
Done.
| |
10 #include "mojo/public/cpp/shell/connect.h" | |
10 #include "mojo/public/interfaces/shell/shell.mojom.h" | 11 #include "mojo/public/interfaces/shell/shell.mojom.h" |
11 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h" | 12 #include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h" |
12 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h" | 13 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h" |
13 #include "mojo/services/public/cpp/view_manager/util.h" | 14 #include "mojo/services/public/cpp/view_manager/util.h" |
14 | 15 |
15 namespace mojo { | 16 namespace mojo { |
16 namespace services { | 17 namespace services { |
17 namespace view_manager { | 18 namespace view_manager { |
18 | 19 |
19 TransportNodeId MakeTransportNodeId(uint16_t connection_id, | 20 TransportNodeId MakeTransportNodeId(uint16_t connection_id, |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
378 ViewManagerPrivate(view_manager_).AddNode(node->id(), node); | 379 ViewManagerPrivate(view_manager_).AddNode(node->id(), node); |
379 } | 380 } |
380 ViewManagerPrivate(view_manager_).set_root(root); | 381 ViewManagerPrivate(view_manager_).set_root(root); |
381 if (init_loop_) | 382 if (init_loop_) |
382 init_loop_->Quit(); | 383 init_loop_->Quit(); |
383 } | 384 } |
384 | 385 |
385 } // namespace view_manager | 386 } // namespace view_manager |
386 } // namespace services | 387 } // namespace services |
387 } // namespace mojo | 388 } // namespace mojo |
OLD | NEW |