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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" | 10 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h" |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | 138 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) |
139 } | 139 } |
140 | 140 |
141 void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted( | 141 void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted( |
142 content::ServiceManagerConnection* connection) { | 142 content::ServiceManagerConnection* connection) { |
143 DCHECK(connection); | 143 DCHECK(connection); |
144 #if defined(USE_AURA) | 144 #if defined(USE_AURA) |
145 if (!service_manager::ServiceManagerIsRemote()) | 145 if (!service_manager::ServiceManagerIsRemote()) |
146 return; | 146 return; |
147 | 147 |
| 148 LOG(WARNING) << "ServiceManagerConnectionStarted"; |
| 149 |
148 input_device_client_ = base::MakeUnique<ui::InputDeviceClient>(); | 150 input_device_client_ = base::MakeUnique<ui::InputDeviceClient>(); |
149 ui::mojom::InputDeviceServerPtr server; | 151 ui::mojom::InputDeviceServerPtr server; |
150 connection->GetConnector()->BindInterface(ui::mojom::kServiceName, &server); | 152 connection->GetConnector()->BindInterface(ui::mojom::kServiceName, &server); |
151 input_device_client_->Connect(std::move(server)); | 153 input_device_client_->Connect(std::move(server)); |
152 | 154 |
153 #if defined(OS_CHROMEOS) | 155 #if defined(OS_CHROMEOS) |
154 if (chromeos::GetAshConfig() != ash::Config::MASH) | 156 if (chromeos::GetAshConfig() != ash::Config::MASH) |
155 return; | 157 return; |
156 #endif | 158 #endif |
157 | 159 |
158 // WMState is owned as a member, so don't have MusClient create it. | 160 // WMState is owned as a member, so don't have MusClient create it. |
159 const bool create_wm_state = false; | 161 const bool create_wm_state = false; |
160 mus_client_ = base::MakeUnique<views::MusClient>( | 162 mus_client_ = base::MakeUnique<views::MusClient>( |
161 connection->GetConnector(), service_manager::Identity(), | 163 connection->GetConnector(), service_manager::Identity(), |
162 content::BrowserThread::GetTaskRunnerForThread( | 164 content::BrowserThread::GetTaskRunnerForThread( |
163 content::BrowserThread::IO), | 165 content::BrowserThread::IO), |
164 create_wm_state); | 166 create_wm_state); |
165 #endif // defined(USE_AURA) | 167 #endif // defined(USE_AURA) |
166 } | 168 } |
OLD | NEW |