diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 19:47:47 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-30 19:47:47 +0000 |
| commit | e7b418bc2ddad0832b849de9e9594745ee180d03 (patch) | |
| tree | 16ad06a92cbfc71e1bc5a4e3254abcb54c40f3c3 /chrome/installer | |
| parent | 813fd51fbd13972fb52b46ef7c1606be80af0fd4 (diff) | |
| download | chromium_src-e7b418bc2ddad0832b849de9e9594745ee180d03.zip chromium_src-e7b418bc2ddad0832b849de9e9594745ee180d03.tar.gz chromium_src-e7b418bc2ddad0832b849de9e9594745ee180d03.tar.bz2 | |
Convert DictionaryValue's keys to std::string (from wstring).
Everything now needs to be changed to avoid the deprecated wstring methods; this
includes the unit tests.
BUG=23581
TEST=all our tests still pass
Review URL: http://codereview.chromium.org/3075010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index e9dff40..d3ee31a 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -19,6 +19,7 @@ #include "base/registry.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "base/wmi_util.h" #include "chrome/common/chrome_switches.h" @@ -235,12 +236,12 @@ bool GoogleChromeDistribution::BuildUninstallMetricsString( iter != uninstall_metrics_dict->end_keys(); ++iter) { has_values = true; metrics->append(L"&"); - metrics->append(*iter); + metrics->append(UTF8ToWide(*iter)); metrics->append(L"="); - std::wstring value; + std::string value; uninstall_metrics_dict->GetStringWithoutPathExpansion(*iter, &value); - metrics->append(value); + metrics->append(UTF8ToWide(value)); } return has_values; |