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" | 9 #include "components/view_manager/public/cpp/view.h" |
10 #include "components/view_manager/public/cpp/view_manager.h" | 10 #include "components/view_manager/public/cpp/view_manager.h" |
11 #include "components/window_manager/window_manager_delegate.h" | 11 #include "components/window_manager/window_manager_delegate.h" |
| 12 #include "mojo/application/public/cpp/application_connection.h" |
| 13 #include "mojo/application/public/cpp/application_impl.h" |
| 14 #include "mojo/application/public/interfaces/shell.mojom.h" |
12 #include "mojo/converters/geometry/geometry_type_converters.h" | 15 #include "mojo/converters/geometry/geometry_type_converters.h" |
13 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio
n.h" | |
14 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | |
15 #include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h" | |
16 | 16 |
17 using mojo::ApplicationConnection; | 17 using mojo::ApplicationConnection; |
18 using mojo::Id; | 18 using mojo::Id; |
19 using mojo::ServiceProvider; | 19 using mojo::ServiceProvider; |
20 using mojo::View; | 20 using mojo::View; |
21 using mojo::WindowManager; | 21 using mojo::WindowManager; |
22 | 22 |
23 namespace window_manager { | 23 namespace window_manager { |
24 | 24 |
25 // Used for calls to Embed() that occur before we've connected to the | 25 // Used for calls to Embed() that occur before we've connected to the |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 view_manager_service_.Pass(), shell_, this)); | 199 view_manager_service_.Pass(), shell_, this)); |
200 } | 200 } |
201 | 201 |
202 void WindowManagerApp::OnAccelerator(mojo::EventPtr event) { | 202 void WindowManagerApp::OnAccelerator(mojo::EventPtr event) { |
203 window_manager_delegate_->OnAcceleratorPressed( | 203 window_manager_delegate_->OnAcceleratorPressed( |
204 root_->view_manager()->GetFocusedView(), | 204 root_->view_manager()->GetFocusedView(), |
205 event->key_data->windows_key_code, event->flags); | 205 event->key_data->windows_key_code, event->flags); |
206 } | 206 } |
207 | 207 |
208 } // namespace window_manager | 208 } // namespace window_manager |
OLD | NEW |