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_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/memory/discardable_memory_allocator.h" |
13 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
| 15 #include "components/discardable_memory/client/client_discardable_shared_memory_
manager.h" |
14 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
15 #include "content/public/common/service_manager_connection.h" | 17 #include "content/public/common/service_manager_connection.h" |
16 #include "services/service_manager/public/cpp/connector.h" | 18 #include "services/service_manager/public/cpp/connector.h" |
17 #include "services/service_manager/runner/common/client_util.h" | 19 #include "services/service_manager/runner/common/client_util.h" |
18 #include "services/ui/public/cpp/gpu/gpu_service.h" | 20 #include "services/ui/public/cpp/gpu/gpu_service.h" |
19 #include "services/ui/public/cpp/input_devices/input_device_client.h" | 21 #include "services/ui/public/cpp/input_devices/input_device_client.h" |
20 #include "services/ui/public/interfaces/constants.mojom.h" | 22 #include "services/ui/public/interfaces/constants.mojom.h" |
21 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.
h" | 23 #include "services/ui/public/interfaces/input_devices/input_device_server.mojom.
h" |
22 #include "ui/display/screen.h" | 24 #include "ui/display/screen.h" |
23 #include "ui/views/mus/window_manager_connection.h" | 25 #include "ui/views/mus/window_manager_connection.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 base::RunLoop wait_loop; | 108 base::RunLoop wait_loop; |
107 connection->SetInitializeHandler(wait_loop.QuitClosure()); | 109 connection->SetInitializeHandler(wait_loop.QuitClosure()); |
108 wait_loop.Run(); | 110 wait_loop.Run(); |
109 | 111 |
110 input_device_client_.reset(new ui::InputDeviceClient()); | 112 input_device_client_.reset(new ui::InputDeviceClient()); |
111 ui::mojom::InputDeviceServerPtr server; | 113 ui::mojom::InputDeviceServerPtr server; |
112 connection->GetConnector()->ConnectToInterface(ui::mojom::kServiceName, | 114 connection->GetConnector()->ConnectToInterface(ui::mojom::kServiceName, |
113 &server); | 115 &server); |
114 input_device_client_->Connect(std::move(server)); | 116 input_device_client_->Connect(std::move(server)); |
115 | 117 |
| 118 discardable_memory::mojom::DiscardableSharedMemoryManagerPtr manager; |
| 119 |
| 120 connection->GetConnector()->ConnectToInterface(ui::mojom::kServiceName, |
| 121 &manager); |
| 122 discardable_shared_memory_manager_ = base::MakeUnique< |
| 123 discardable_memory::ClientDiscardableSharedMemoryManager>( |
| 124 std::move(manager), content::BrowserThread::GetTaskRunnerForThread( |
| 125 content::BrowserThread::IO)); |
| 126 base::DiscardableMemoryAllocator::SetInstance( |
| 127 discardable_shared_memory_manager_.get()); |
| 128 |
116 window_manager_connection_ = views::WindowManagerConnection::Create( | 129 window_manager_connection_ = views::WindowManagerConnection::Create( |
117 connection->GetConnector(), connection->GetIdentity(), | 130 connection->GetConnector(), connection->GetIdentity(), |
118 content::BrowserThread::GetTaskRunnerForThread( | 131 content::BrowserThread::GetTaskRunnerForThread( |
119 content::BrowserThread::IO)); | 132 content::BrowserThread::IO)); |
120 } | 133 } |
121 #endif // defined(USE_AURA) | 134 #endif // defined(USE_AURA) |
122 } | 135 } |
OLD | NEW |