| 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 "base/run_loop.h" | 12 #include "base/run_loop.h" |
| 13 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 14 #include "content/public/common/service_manager_connection.h" | 14 #include "content/public/common/service_manager_connection.h" |
| 15 #include "services/service_manager/public/cpp/connector.h" | 15 #include "services/service_manager/public/cpp/connector.h" |
| 16 #include "services/service_manager/runner/common/client_util.h" | 16 #include "services/service_manager/runner/common/client_util.h" |
| 17 #include "services/ui/public/cpp/gpu_service.h" | 17 #include "services/ui/public/cpp/gpu_service.h" |
| 18 #include "services/ui/public/cpp/input_devices/input_device_client.h" | 18 #include "services/ui/public/cpp/input_devices/input_device_client.h" |
| 19 #include "services/ui/public/interfaces/constants.mojom.h" |
| 19 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.
h" | 20 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.
h" |
| 20 #include "ui/display/screen.h" | 21 #include "ui/display/screen.h" |
| 21 #include "ui/views/mus/window_manager_connection.h" | 22 #include "ui/views/mus/window_manager_connection.h" |
| 22 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 23 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 23 #include "ui/wm/core/wm_state.h" | 24 #include "ui/wm/core/wm_state.h" |
| 24 #endif // defined(USE_AURA) | 25 #endif // defined(USE_AURA) |
| 25 | 26 |
| 26 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 27 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 27 #include "base/command_line.h" | 28 #include "base/command_line.h" |
| 28 #include "chrome/browser/ui/simple_message_box.h" | 29 #include "chrome/browser/ui/simple_message_box.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 #if defined(USE_AURA) | 95 #if defined(USE_AURA) |
| 95 if (service_manager::ServiceManagerIsRemote()) { | 96 if (service_manager::ServiceManagerIsRemote()) { |
| 96 // TODO(rockot): Remove the blocking wait for init. | 97 // TODO(rockot): Remove the blocking wait for init. |
| 97 // http://crbug.com/594852. | 98 // http://crbug.com/594852. |
| 98 base::RunLoop wait_loop; | 99 base::RunLoop wait_loop; |
| 99 connection->SetInitializeHandler(wait_loop.QuitClosure()); | 100 connection->SetInitializeHandler(wait_loop.QuitClosure()); |
| 100 wait_loop.Run(); | 101 wait_loop.Run(); |
| 101 | 102 |
| 102 input_device_client_.reset(new ui::InputDeviceClient()); | 103 input_device_client_.reset(new ui::InputDeviceClient()); |
| 103 ui::mojom::InputDeviceServerPtr server; | 104 ui::mojom::InputDeviceServerPtr server; |
| 104 connection->GetConnector()->ConnectToInterface("ui", &server); | 105 connection->GetConnector()->ConnectToInterface(ui::mojom::kServiceName, |
| 106 &server); |
| 105 input_device_client_->Connect(std::move(server)); | 107 input_device_client_->Connect(std::move(server)); |
| 106 | 108 |
| 107 window_manager_connection_ = views::WindowManagerConnection::Create( | 109 window_manager_connection_ = views::WindowManagerConnection::Create( |
| 108 connection->GetConnector(), connection->GetIdentity(), | 110 connection->GetConnector(), connection->GetIdentity(), |
| 109 content::BrowserThread::GetTaskRunnerForThread( | 111 content::BrowserThread::GetTaskRunnerForThread( |
| 110 content::BrowserThread::IO)); | 112 content::BrowserThread::IO)); |
| 111 } | 113 } |
| 112 #endif // defined(USE_AURA) | 114 #endif // defined(USE_AURA) |
| 113 } | 115 } |
| OLD | NEW |