| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "content/browser/devtools/protocol/system_info_handler.h" | 5 #include "content/browser/devtools/protocol/system_info_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "content/browser/gpu/compositor_util.h" | 8 #include "content/browser/gpu/compositor_util.h" |
| 9 #include "content/public/browser/gpu_data_manager.h" | 9 #include "content/public/browser/gpu_data_manager.h" |
| 10 #include "gpu/config/gpu_info.h" | 10 #include "gpu/config/gpu_info.h" |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 devices.push_back(GPUDeviceToProtocol(device)); | 190 devices.push_back(GPUDeviceToProtocol(device)); |
| 191 | 191 |
| 192 scoped_ptr<base::DictionaryValue> aux_attributes(new base::DictionaryValue); | 192 scoped_ptr<base::DictionaryValue> aux_attributes(new base::DictionaryValue); |
| 193 AuxGPUInfoEnumerator enumerator(aux_attributes.get()); | 193 AuxGPUInfoEnumerator enumerator(aux_attributes.get()); |
| 194 gpu_info.EnumerateFields(&enumerator); | 194 gpu_info.EnumerateFields(&enumerator); |
| 195 | 195 |
| 196 scoped_refptr<GPUInfo> gpu = GPUInfo::Create() | 196 scoped_refptr<GPUInfo> gpu = GPUInfo::Create() |
| 197 ->set_devices(devices) | 197 ->set_devices(devices) |
| 198 ->set_aux_attributes(aux_attributes.Pass()) | 198 ->set_aux_attributes(aux_attributes.Pass()) |
| 199 ->set_feature_status(make_scoped_ptr(GetFeatureStatus())) | 199 ->set_feature_status(make_scoped_ptr(GetFeatureStatus())) |
| 200 ->set_feature_status(make_scoped_ptr(GetGmbStatus())) |
| 200 ->set_driver_bug_workarounds(GetDriverBugWorkarounds()); | 201 ->set_driver_bug_workarounds(GetDriverBugWorkarounds()); |
| 201 | 202 |
| 202 client_->SendGetInfoResponse( | 203 client_->SendGetInfoResponse( |
| 203 command_id, | 204 command_id, |
| 204 GetInfoResponse::Create()->set_gpu(gpu) | 205 GetInfoResponse::Create()->set_gpu(gpu) |
| 205 ->set_model_name(gpu_info.machine_model_name) | 206 ->set_model_name(gpu_info.machine_model_name) |
| 206 ->set_model_version(gpu_info.machine_model_version)); | 207 ->set_model_version(gpu_info.machine_model_version)); |
| 207 } | 208 } |
| 208 | 209 |
| 209 void SystemInfoHandler::AddActiveObserverId(int observer_id) { | 210 void SystemInfoHandler::AddActiveObserverId(int observer_id) { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 224 SendGetInfoResponse(command_id); | 225 SendGetInfoResponse(command_id); |
| 225 // For the time being we want to know about this event in the test logs. | 226 // For the time being we want to know about this event in the test logs. |
| 226 LOG(ERROR) << "SystemInfoHandler: request for GPU info timed out!" | 227 LOG(ERROR) << "SystemInfoHandler: request for GPU info timed out!" |
| 227 << " Most recent info sent."; | 228 << " Most recent info sent."; |
| 228 } | 229 } |
| 229 } | 230 } |
| 230 | 231 |
| 231 } // namespace system_info | 232 } // namespace system_info |
| 232 } // namespace devtools | 233 } // namespace devtools |
| 233 } // namespace content | 234 } // namespace content |
| OLD | NEW |