OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/common/child_process_logging.h" | 5 #include "chrome/common/child_process_logging.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 | 8 |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/string_number_conversions.h" |
10 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
11 #include "chrome/common/chrome_constants.h" | 12 #include "chrome/common/chrome_constants.h" |
12 #include "chrome/installer/util/google_update_settings.h" | 13 #include "chrome/installer/util/google_update_settings.h" |
13 #include "googleurl/src/gurl.h" | 14 #include "googleurl/src/gurl.h" |
14 | 15 |
15 namespace child_process_logging { | 16 namespace child_process_logging { |
16 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetActiveURL. | 17 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetActiveURL. |
17 typedef void (__cdecl *MainSetActiveURL)(const wchar_t*); | 18 typedef void (__cdecl *MainSetActiveURL)(const wchar_t*); |
18 | 19 |
19 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetClientId. | 20 // exported in breakpad_win.cc: void __declspec(dllexport) __cdecl SetClientId. |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 static MainSetGpuInfo set_gpu_info = NULL; | 99 static MainSetGpuInfo set_gpu_info = NULL; |
99 if (!set_gpu_info) { | 100 if (!set_gpu_info) { |
100 HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName); | 101 HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName); |
101 if (!exe_module) | 102 if (!exe_module) |
102 return; | 103 return; |
103 set_gpu_info = reinterpret_cast<MainSetGpuInfo>( | 104 set_gpu_info = reinterpret_cast<MainSetGpuInfo>( |
104 GetProcAddress(exe_module, "SetGpuInfo")); | 105 GetProcAddress(exe_module, "SetGpuInfo")); |
105 if (!set_gpu_info) | 106 if (!set_gpu_info) |
106 return; | 107 return; |
107 } | 108 } |
108 (set_gpu_info)(UintToWString(gpu_info.vendor_id()).c_str(), | 109 (set_gpu_info)( |
109 UintToWString(gpu_info.device_id()).c_str(), | 110 base::UintToString16(gpu_info.vendor_id()).c_str(), |
110 gpu_info.driver_version().c_str(), | 111 base::UintToString16(gpu_info.device_id()).c_str(), |
111 UintToWString(gpu_info.pixel_shader_version()).c_str(), | 112 gpu_info.driver_version().c_str(), |
112 UintToWString(gpu_info.vertex_shader_version()).c_str()); | 113 base::UintToString16(gpu_info.pixel_shader_version()).c_str(), |
| 114 base::UintToString16(gpu_info.vertex_shader_version()).c_str()); |
113 } | 115 } |
114 | 116 |
115 } // namespace child_process_logging | 117 } // namespace child_process_logging |
OLD | NEW |