| 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 "components/window_manager/window_manager_app.h" | 5 #include "components/window_manager/window_manager_app.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
| 9 #include "components/view_manager/public/cpp/view.h" |
| 10 #include "components/view_manager/public/cpp/view_manager.h" |
| 9 #include "components/window_manager/capture_controller.h" | 11 #include "components/window_manager/capture_controller.h" |
| 10 #include "components/window_manager/focus_controller.h" | 12 #include "components/window_manager/focus_controller.h" |
| 11 #include "components/window_manager/focus_rules.h" | 13 #include "components/window_manager/focus_rules.h" |
| 12 #include "components/window_manager/hit_test.h" | 14 #include "components/window_manager/hit_test.h" |
| 13 #include "components/window_manager/view_event_dispatcher.h" | 15 #include "components/window_manager/view_event_dispatcher.h" |
| 14 #include "components/window_manager/view_target.h" | 16 #include "components/window_manager/view_target.h" |
| 15 #include "components/window_manager/view_targeter.h" | 17 #include "components/window_manager/view_targeter.h" |
| 16 #include "components/window_manager/window_manager_delegate.h" | 18 #include "components/window_manager/window_manager_delegate.h" |
| 17 #include "mojo/converters/geometry/geometry_type_converters.h" | 19 #include "mojo/converters/geometry/geometry_type_converters.h" |
| 18 #include "mojo/converters/input_events/input_events_type_converters.h" | 20 #include "mojo/converters/input_events/input_events_type_converters.h" |
| 19 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" | 21 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" |
| 20 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | 22 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" |
| 21 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" | 23 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" |
| 22 #include "third_party/mojo_services/src/view_manager/public/cpp/view.h" | |
| 23 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h" | |
| 24 | 24 |
| 25 using mojo::ApplicationConnection; | 25 using mojo::ApplicationConnection; |
| 26 using mojo::Id; | 26 using mojo::Id; |
| 27 using mojo::ServiceProvider; | 27 using mojo::ServiceProvider; |
| 28 using mojo::View; | 28 using mojo::View; |
| 29 using mojo::WindowManager; | 29 using mojo::WindowManager; |
| 30 | 30 |
| 31 namespace window_manager { | 31 namespace window_manager { |
| 32 | 32 |
| 33 namespace { | 33 namespace { |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 void WindowManagerApp::SetViewManagerClient( | 408 void WindowManagerApp::SetViewManagerClient( |
| 409 mojo::ScopedMessagePipeHandle view_manager_client_request) { | 409 mojo::ScopedMessagePipeHandle view_manager_client_request) { |
| 410 view_manager_client_.reset( | 410 view_manager_client_.reset( |
| 411 mojo::ViewManagerClientFactory::WeakBindViewManagerToPipe( | 411 mojo::ViewManagerClientFactory::WeakBindViewManagerToPipe( |
| 412 mojo::MakeRequest<mojo::ViewManagerClient>( | 412 mojo::MakeRequest<mojo::ViewManagerClient>( |
| 413 view_manager_client_request.Pass()), | 413 view_manager_client_request.Pass()), |
| 414 view_manager_service_.Pass(), shell_, this)); | 414 view_manager_service_.Pass(), shell_, this)); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace window_manager | 417 } // namespace window_manager |
| OLD | NEW |