diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 17:18:27 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 17:18:27 +0000 |
| commit | 1635bc1557f1a8612334cc274d4db3f25dddad51 (patch) | |
| tree | f825a93f8c4ae7fd757d348923a7da0b05dd9535 /chrome/installer | |
| parent | bc0caef9b0af84365b6dd546cd21673c9790ca58 (diff) | |
| download | chromium_src-1635bc1557f1a8612334cc274d4db3f25dddad51.zip chromium_src-1635bc1557f1a8612334cc274d4db3f25dddad51.tar.gz chromium_src-1635bc1557f1a8612334cc274d4db3f25dddad51.tar.bz2 | |
Remove deprecated wstring ctor of JSONFileValueSerializer.
Switched callers to FilePath.
Review URL: http://codereview.chromium.org/62009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 7766484..76ea297 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -11,6 +11,7 @@ #include <windows.h> #include <msi.h> +#include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/registry.h" @@ -64,7 +65,7 @@ bool GoogleChromeDistribution::BuildUninstallMetricsString( bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile( const std::wstring& file_path, std::wstring* uninstall_metrics_string) { - JSONFileValueSerializer json_serializer(file_path); + JSONFileValueSerializer json_serializer(FilePath::FromWStringHack(file_path)); std::string json_error_string; scoped_ptr<Value> root(json_serializer.Deserialize(NULL)); @@ -166,7 +167,7 @@ std::wstring GoogleChromeDistribution::GetApplicationName() { std::wstring GoogleChromeDistribution::GetAlternateApplicationName() { const std::wstring& alt_product_name = - installer_util::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE); + installer_util::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE); return alt_product_name; } |