diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 20:05:47 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 20:05:47 +0000 |
| commit | 6cc8ece6614023a11359a3504bcf76104ba6ba61 (patch) | |
| tree | 95cd3ec77cfe989c121fd98f2fa31fbde3eec6ae /chrome/common/child_process_logging_win.cc | |
| parent | b3b9b508b81bd690d4f8ec1cdc4b53d7e6db08a1 (diff) | |
| download | chromium_src-6cc8ece6614023a11359a3504bcf76104ba6ba61.zip chromium_src-6cc8ece6614023a11359a3504bcf76104ba6ba61.tar.gz chromium_src-6cc8ece6614023a11359a3504bcf76104ba6ba61.tar.bz2 | |
Refactoring GPUInfo: 1) remove the level field; instead, having a finalized field indicating if more info might be collected. 2) change version data from uint32 to string.
Refactoring GpuDataManager: 1) remove GpuFeatureAllowed() because we expose un-filtered flags through GpuFeatureFlags(). 2) disallow launch GPU process to collect gpu info if accelerated_compositing is not allowed.
BUG=none
TEST=unittest
Review URL: http://codereview.chromium.org/6672004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/child_process_logging_win.cc')
| -rw-r--r-- | chrome/common/child_process_logging_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc index a5b7d88..6f9650c 100644 --- a/chrome/common/child_process_logging_win.cc +++ b/chrome/common/child_process_logging_win.cc @@ -141,8 +141,8 @@ void SetGpuInfo(const GPUInfo& gpu_info) { base::StringPrintf(L"0x%04x", gpu_info.vendor_id).c_str(), base::StringPrintf(L"0x%04x", gpu_info.device_id).c_str(), UTF8ToUTF16(gpu_info.driver_version).c_str(), - base::UintToString16(gpu_info.pixel_shader_version).c_str(), - base::UintToString16(gpu_info.vertex_shader_version).c_str()); + UTF8ToUTF16(gpu_info.pixel_shader_version).c_str(), + UTF8ToUTF16(gpu_info.vertex_shader_version).c_str()); } void SetNumberOfViews(int number_of_views) { |