OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" | 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" |
6 | 6 |
7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" | 7 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" |
8 #include "chrome/browser/ui/views/chrome_views_delegate.h" | 8 #include "chrome/browser/ui/views/chrome_views_delegate.h" |
9 #include "components/constrained_window/constrained_window_views.h" | 9 #include "components/constrained_window/constrained_window_views.h" |
10 | 10 |
11 #if defined(USE_AURA) | 11 #if defined(USE_AURA) |
12 #include "ui/display/screen.h" | 12 #include "ui/display/screen.h" |
13 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 13 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
14 #include "ui/wm/core/wm_state.h" | 14 #include "ui/wm/core/wm_state.h" |
15 #endif | 15 #endif |
16 | 16 |
17 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) | 17 #if defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) |
18 #include "components/mus/public/cpp/input_devices/input_device_client.h" | |
19 #include "components/mus/public/interfaces/input_devices/input_device_server.moj
om.h" | |
20 #include "content/public/common/mojo_shell_connection.h" | 18 #include "content/public/common/mojo_shell_connection.h" |
21 #include "services/shell/public/cpp/connector.h" | 19 #include "services/shell/public/cpp/connector.h" |
22 #include "services/shell/runner/common/client_util.h" | 20 #include "services/shell/runner/common/client_util.h" |
| 21 #include "services/ui/public/cpp/input_devices/input_device_client.h" |
| 22 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.
h" |
23 #include "ui/views/mus/window_manager_connection.h" | 23 #include "ui/views/mus/window_manager_connection.h" |
24 #endif | 24 #endif |
25 | 25 |
26 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { | 26 ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() { |
27 } | 27 } |
28 | 28 |
29 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { | 29 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() { |
30 constrained_window::SetConstrainedWindowViewsClient(nullptr); | 30 constrained_window::SetConstrainedWindowViewsClient(nullptr); |
31 } | 31 } |
32 | 32 |
(...skipping 27 matching lines...) Expand all Loading... |
60 &server); | 60 &server); |
61 input_device_client_->Connect(std::move(server)); | 61 input_device_client_->Connect(std::move(server)); |
62 | 62 |
63 window_manager_connection_ = views::WindowManagerConnection::Create( | 63 window_manager_connection_ = views::WindowManagerConnection::Create( |
64 mojo_shell_connection->GetConnector(), | 64 mojo_shell_connection->GetConnector(), |
65 mojo_shell_connection->GetIdentity()); | 65 mojo_shell_connection->GetIdentity()); |
66 } | 66 } |
67 #endif // defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) | 67 #endif // defined(USE_AURA) && defined(MOJO_SHELL_CLIENT) |
68 ChromeBrowserMainExtraParts::PreProfileInit(); | 68 ChromeBrowserMainExtraParts::PreProfileInit(); |
69 } | 69 } |
OLD | NEW |