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/bind.h" | 8 #include "base/bind.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
12 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
13 #include "mojo/common/common_type_converters.h" | 13 #include "mojo/common/common_type_converters.h" |
14 #include "mojo/geometry/geometry_type_converters.h" | |
15 #include "mojo/public/cpp/application/connect.h" | 14 #include "mojo/public/cpp/application/connect.h" |
16 #include "mojo/public/cpp/bindings/allocation_scope.h" | 15 #include "mojo/public/cpp/bindings/allocation_scope.h" |
17 #include "mojo/public/cpp/environment/environment.h" | 16 #include "mojo/public/cpp/environment/environment.h" |
| 17 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
18 #include "mojo/services/public/cpp/view_manager/util.h" | 18 #include "mojo/services/public/cpp/view_manager/util.h" |
19 #include "mojo/services/public/cpp/view_manager/view_manager_types.h" | 19 #include "mojo/services/public/cpp/view_manager/view_manager_types.h" |
20 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" | 20 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
21 #include "mojo/shell/shell_test_helper.h" | 21 #include "mojo/shell/shell_test_helper.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
23 #include "ui/gfx/geometry/rect.h" | 23 #include "ui/gfx/geometry/rect.h" |
24 | 24 |
25 namespace mojo { | 25 namespace mojo { |
26 | 26 |
27 // TODO(sky): remove this when Darin is done with cleanup. | 27 // TODO(sky): remove this when Darin is done with cleanup. |
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1443 ASSERT_EQ(1u, nodes.size()); | 1443 ASSERT_EQ(1u, nodes.size()); |
1444 EXPECT_EQ("node=1,1 parent=null view=null", nodes[0].ToString()); | 1444 EXPECT_EQ("node=1,1 parent=null view=null", nodes[0].ToString()); |
1445 } | 1445 } |
1446 | 1446 |
1447 // TODO(sky): add coverage of test that destroys connections and ensures other | 1447 // TODO(sky): add coverage of test that destroys connections and ensures other |
1448 // connections get deletion notification (or advanced server id). | 1448 // connections get deletion notification (or advanced server id). |
1449 | 1449 |
1450 } // namespace service | 1450 } // namespace service |
1451 } // namespace view_manager | 1451 } // namespace view_manager |
1452 } // namespace mojo | 1452 } // namespace mojo |
OLD | NEW |