| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/media/webrtc_logging_handler_host.h" | 5 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 chromeos::system::StatisticsProvider::GetInstance()-> | 608 chromeos::system::StatisticsProvider::GetInstance()-> |
| 609 GetMachineStatistic(chromeos::system::kHardwareClassKey, &computer_model); | 609 GetMachineStatistic(chromeos::system::kHardwareClassKey, &computer_model); |
| 610 #endif | 610 #endif |
| 611 LogToCircularBuffer("Computer model: " + computer_model); | 611 LogToCircularBuffer("Computer model: " + computer_model); |
| 612 | 612 |
| 613 // GPU | 613 // GPU |
| 614 gpu::GPUInfo gpu_info = content::GpuDataManager::GetInstance()->GetGPUInfo(); | 614 gpu::GPUInfo gpu_info = content::GpuDataManager::GetInstance()->GetGPUInfo(); |
| 615 LogToCircularBuffer( | 615 LogToCircularBuffer( |
| 616 "Gpu: machine-model-name=" + gpu_info.machine_model_name + | 616 "Gpu: machine-model-name=" + gpu_info.machine_model_name + |
| 617 ", machine-model-version=" + gpu_info.machine_model_version + | 617 ", machine-model-version=" + gpu_info.machine_model_version + |
| 618 ", vendor-id=" + IntToString(gpu_info.gpu.vendor_id) + | 618 ", vendor-id=" + base::UintToString(gpu_info.gpu.vendor_id) + |
| 619 ", device-id=" + IntToString(gpu_info.gpu.device_id) + | 619 ", device-id=" + base::UintToString(gpu_info.gpu.device_id) + |
| 620 ", driver-vendor=" + gpu_info.driver_vendor + | 620 ", driver-vendor=" + gpu_info.driver_vendor + |
| 621 ", driver-version=" + gpu_info.driver_version); | 621 ", driver-version=" + gpu_info.driver_version); |
| 622 LogToCircularBuffer( | 622 LogToCircularBuffer( |
| 623 "OpenGL: gl-vendor=" + gpu_info.gl_vendor + | 623 "OpenGL: gl-vendor=" + gpu_info.gl_vendor + |
| 624 ", gl-renderer=" + gpu_info.gl_renderer + | 624 ", gl-renderer=" + gpu_info.gl_renderer + |
| 625 ", gl-version=" + gpu_info.gl_version); | 625 ", gl-version=" + gpu_info.gl_version); |
| 626 | 626 |
| 627 // Network interfaces | 627 // Network interfaces |
| 628 LogToCircularBuffer("Discovered " + IntToString(network_list.size()) + | 628 LogToCircularBuffer("Discovered " + base::SizeTToString(network_list.size()) + |
| 629 " network interfaces:"); | 629 " network interfaces:"); |
| 630 for (net::NetworkInterfaceList::const_iterator it = network_list.begin(); | 630 for (net::NetworkInterfaceList::const_iterator it = network_list.begin(); |
| 631 it != network_list.end(); ++it) { | 631 it != network_list.end(); ++it) { |
| 632 LogToCircularBuffer( | 632 LogToCircularBuffer( |
| 633 "Name: " + it->friendly_name + ", Address: " + | 633 "Name: " + it->friendly_name + ", Address: " + |
| 634 IPAddressToSensitiveString(it->address) + ", Type: " + | 634 IPAddressToSensitiveString(it->address) + ", Type: " + |
| 635 net::NetworkChangeNotifier::ConnectionTypeToString(it->type)); | 635 net::NetworkChangeNotifier::ConnectionTypeToString(it->type)); |
| 636 } | 636 } |
| 637 | 637 |
| 638 NotifyLoggingStarted(callback); | 638 NotifyLoggingStarted(callback); |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 WebRtcRtpDumpHandler::ReleasedDumps rtp_dumps( | 763 WebRtcRtpDumpHandler::ReleasedDumps rtp_dumps( |
| 764 rtp_dump_handler_->ReleaseDumps()); | 764 rtp_dump_handler_->ReleaseDumps()); |
| 765 log_paths->incoming_rtp_dump = rtp_dumps.incoming_dump_path; | 765 log_paths->incoming_rtp_dump = rtp_dumps.incoming_dump_path; |
| 766 log_paths->outgoing_rtp_dump = rtp_dumps.outgoing_dump_path; | 766 log_paths->outgoing_rtp_dump = rtp_dumps.outgoing_dump_path; |
| 767 | 767 |
| 768 rtp_dump_handler_.reset(); | 768 rtp_dump_handler_.reset(); |
| 769 stop_rtp_dump_callback_.Reset(); | 769 stop_rtp_dump_callback_.Reset(); |
| 770 | 770 |
| 771 return true; | 771 return true; |
| 772 } | 772 } |
| OLD | NEW |