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 11 matching lines...) Expand all Loading... |
22 #include "mojo/public/cpp/application/connect.h" | 22 #include "mojo/public/cpp/application/connect.h" |
23 #include "mojo/public/cpp/application/interface_factory_impl.h" | 23 #include "mojo/public/cpp/application/interface_factory_impl.h" |
24 #include "mojo/public/cpp/bindings/lib/router.h" | 24 #include "mojo/public/cpp/bindings/lib/router.h" |
25 #include "mojo/public/interfaces/application/service_provider.mojom.h" | 25 #include "mojo/public/interfaces/application/service_provider.mojom.h" |
26 #include "mojo/services/public/cpp/native_viewport/args.h" | 26 #include "mojo/services/public/cpp/native_viewport/args.h" |
27 #include "mojo/services/public/cpp/view_manager/types.h" | 27 #include "mojo/services/public/cpp/view_manager/types.h" |
28 #include "mojo/services/public/cpp/view_manager/util.h" | 28 #include "mojo/services/public/cpp/view_manager/util.h" |
29 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" | 29 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
30 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" | 30 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" |
31 #include "mojo/services/public/interfaces/window_manager/window_manager_internal
.mojom.h" | 31 #include "mojo/services/public/interfaces/window_manager/window_manager_internal
.mojom.h" |
32 #include "mojo/services/view_manager/ids.h" | |
33 #include "mojo/services/view_manager/test_change_tracker.h" | |
34 #include "mojo/shell/shell_test_helper.h" | 32 #include "mojo/shell/shell_test_helper.h" |
| 33 #include "services/view_manager/ids.h" |
| 34 #include "services/view_manager/test_change_tracker.h" |
35 #include "testing/gtest/include/gtest/gtest.h" | 35 #include "testing/gtest/include/gtest/gtest.h" |
36 #include "ui/gfx/geometry/rect.h" | 36 #include "ui/gfx/geometry/rect.h" |
37 | 37 |
38 #if defined(OS_WIN) | 38 #if defined(OS_WIN) |
39 #include "ui/gfx/win/window_impl.h" | 39 #include "ui/gfx/win/window_impl.h" |
40 #endif | 40 #endif |
41 | 41 |
42 namespace mojo { | 42 namespace mojo { |
43 namespace service { | 43 namespace service { |
44 | 44 |
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1615 EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL", | 1615 EXPECT_EQ("PropertyChanged view=1,1 key=one value=NULL", |
1616 ChangesToDescription1(connection2_->changes())[0]); | 1616 ChangesToDescription1(connection2_->changes())[0]); |
1617 } | 1617 } |
1618 } | 1618 } |
1619 | 1619 |
1620 // WARNING: this class is deprecated and will be replaced with | 1620 // WARNING: this class is deprecated and will be replaced with |
1621 // view_manager_server_apptest soonish. Add new tests there. | 1621 // view_manager_server_apptest soonish. Add new tests there. |
1622 | 1622 |
1623 } // namespace service | 1623 } // namespace service |
1624 } // namespace mojo | 1624 } // namespace mojo |
OLD | NEW |