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 "chrome/browser/ui/views/ime_driver_mus.h" | 9 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h" |
10 #include "components/constrained_window/constrained_window_views.h" | 10 #include "components/constrained_window/constrained_window_views.h" |
11 | 11 |
12 #if defined(USE_AURA) | 12 #if defined(USE_AURA) |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/common/service_manager_connection.h" | 15 #include "content/public/common/service_manager_connection.h" |
16 #include "services/service_manager/public/cpp/connector.h" | 16 #include "services/service_manager/public/cpp/connector.h" |
17 #include "services/service_manager/runner/common/client_util.h" | 17 #include "services/service_manager/runner/common/client_util.h" |
18 #include "services/ui/public/cpp/gpu/gpu.h" | 18 #include "services/ui/public/cpp/gpu/gpu.h" |
19 #include "services/ui/public/cpp/input_devices/input_device_client.h" | 19 #include "services/ui/public/cpp/input_devices/input_device_client.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 &server); | 113 &server); |
114 input_device_client_->Connect(std::move(server)); | 114 input_device_client_->Connect(std::move(server)); |
115 | 115 |
116 window_manager_connection_ = views::WindowManagerConnection::Create( | 116 window_manager_connection_ = views::WindowManagerConnection::Create( |
117 connection->GetConnector(), connection->GetIdentity(), | 117 connection->GetConnector(), connection->GetIdentity(), |
118 content::BrowserThread::GetTaskRunnerForThread( | 118 content::BrowserThread::GetTaskRunnerForThread( |
119 content::BrowserThread::IO)); | 119 content::BrowserThread::IO)); |
120 } | 120 } |
121 #endif // defined(USE_AURA) | 121 #endif // defined(USE_AURA) |
122 } | 122 } |
OLD | NEW |