diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 01:32:58 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 01:32:58 +0000 |
| commit | a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad (patch) | |
| tree | abe85be335ec148e1d232be881033776c2c20f48 /remoting/base/breakpad_win.cc | |
| parent | cdd4234611a47a064a8b15c2f3a7f47676286cef (diff) | |
| download | chromium_src-a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad.zip chromium_src-a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad.tar.gz chromium_src-a11dbe9b75e6ec3e4fd8d9878526fa27426d59ad.tar.bz2 | |
Cleaned up usage of std::wstring in src/remoting. Added presubmit warning supressions for the remaning instances because they depend on hard-to-change public APIs.
BUG=133003
Review URL: https://chromiumcodereview.appspot.com/10824166
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base/breakpad_win.cc')
| -rw-r--r-- | remoting/base/breakpad_win.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc index 05f1866..ef16a24 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( |