Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: remoting/base/breakpad_win.cc

Issue 10824166: Cleaned up usage of std::wstring in src/remoting. Added presubmit warning supressions for the reman… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « PRESUBMIT.py ('k') | remoting/host/host_event_logger_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/breakpad_win.cc
diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc
index 05f1866524a77c7157bbffe8dd176ee0efd83f5f..ef16a24048c881ecd93ddcc4da125fc0d5bba099 100644
--- a/remoting/base/breakpad_win.cc
+++ b/remoting/base/breakpad_win.cc
@@ -153,14 +153,15 @@ google_breakpad::CustomClientInfo* BreakpadWin::GetCustomInfo() {
scoped_ptr<FileVersionInfo> version_info(
FileVersionInfo::CreateFileVersionInfoForModule(binary));
- std::wstring version;
- if (version_info.get())
- version = UTF16ToWide(version_info->product_version());
- if (version.empty())
- version = kBreakpadVersionDefault;
+ static wchar_t version[64];
+ if (version_info.get()) {
+ wcscpy_s(version, UTF16ToWide(version_info->product_version()).c_str());
+ } else {
+ wcscpy_s(version, kBreakpadVersionDefault);
+ }
static google_breakpad::CustomInfoEntry ver_entry(
- kBreakpadVersionEntry, version.c_str());
+ kBreakpadVersionEntry, version);
static google_breakpad::CustomInfoEntry prod_entry(
kBreakpadProdEntry, kBreakpadProductName);
static google_breakpad::CustomInfoEntry plat_entry(
« no previous file with comments | « PRESUBMIT.py ('k') | remoting/host/host_event_logger_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698