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/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "components/view_manager/client_connection.h" | 9 #include "components/view_manager/client_connection.h" |
10 #include "components/view_manager/connection_manager.h" | 10 #include "components/view_manager/connection_manager.h" |
11 #include "components/view_manager/connection_manager_delegate.h" | 11 #include "components/view_manager/connection_manager_delegate.h" |
12 #include "components/view_manager/display_manager.h" | 12 #include "components/view_manager/display_manager.h" |
13 #include "components/view_manager/ids.h" | 13 #include "components/view_manager/ids.h" |
14 #include "components/view_manager/public/cpp/types.h" | 14 #include "components/view_manager/public/cpp/types.h" |
15 #include "components/view_manager/public/cpp/util.h" | 15 #include "components/view_manager/public/cpp/util.h" |
16 #include "components/view_manager/public/interfaces/view_manager.mojom.h" | 16 #include "components/view_manager/public/interfaces/view_manager.mojom.h" |
17 #include "components/view_manager/server_view.h" | 17 #include "components/view_manager/server_view.h" |
18 #include "components/view_manager/test_change_tracker.h" | 18 #include "components/view_manager/test_change_tracker.h" |
19 #include "components/view_manager/view_manager_service_impl.h" | 19 #include "components/view_manager/view_manager_service_impl.h" |
20 #include "components/window_manager/public/interfaces/window_manager.mojom.h" | 20 #include "components/window_manager/public/interfaces/window_manager.mojom.h" |
21 #include "components/window_manager/public/interfaces/window_manager_internal.mo
jom.h" | 21 #include "components/window_manager/public/interfaces/window_manager_internal.mo
jom.h" |
| 22 #include "mojo/application/public/interfaces/service_provider.mojom.h" |
22 #include "mojo/converters/geometry/geometry_type_converters.h" | 23 #include "mojo/converters/geometry/geometry_type_converters.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
24 #include "third_party/mojo/src/mojo/public/interfaces/application/service_provid
er.mojom.h" | |
25 #include "ui/gfx/geometry/rect.h" | 25 #include "ui/gfx/geometry/rect.h" |
26 | 26 |
27 using mojo::Array; | 27 using mojo::Array; |
28 using mojo::ERROR_CODE_NONE; | 28 using mojo::ERROR_CODE_NONE; |
29 using mojo::InterfaceRequest; | 29 using mojo::InterfaceRequest; |
30 using mojo::ServiceProvider; | 30 using mojo::ServiceProvider; |
31 using mojo::ServiceProviderPtr; | 31 using mojo::ServiceProviderPtr; |
32 using mojo::String; | 32 using mojo::String; |
33 using mojo::ViewDataPtr; | 33 using mojo::ViewDataPtr; |
34 | 34 |
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 EXPECT_EQ(connection_manager()->root(), | 557 EXPECT_EQ(connection_manager()->root(), |
558 connection_manager()->GetFocusedView()); | 558 connection_manager()->GetFocusedView()); |
559 ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u); | 559 ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u); |
560 EXPECT_EQ("InputEvent view=0,1 event_action=4", | 560 EXPECT_EQ("InputEvent view=0,1 event_action=4", |
561 ChangesToDescription1(*wm_client()->tracker()->changes())[0]); | 561 ChangesToDescription1(*wm_client()->tracker()->changes())[0]); |
562 EXPECT_TRUE(connection1_client->tracker()->changes()->empty()); | 562 EXPECT_TRUE(connection1_client->tracker()->changes()->empty()); |
563 ; | 563 ; |
564 } | 564 } |
565 | 565 |
566 } // namespace view_manager | 566 } // namespace view_manager |
OLD | NEW |