diff options
| author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 21:49:53 +0000 |
|---|---|---|
| committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 21:49:53 +0000 |
| commit | 3a79b3cc8393d54d72c8c7e14615fe64d86fd039 (patch) | |
| tree | 2730ef27672c8f9c9e1b6ef3f443434ac98bfd4f /chrome/browser/browser_main.cc | |
| parent | 1c9e90e17741f9c34f4cbe7f3e68a8300ed24e08 (diff) | |
| download | chromium_src-3a79b3cc8393d54d72c8c7e14615fe64d86fd039.zip chromium_src-3a79b3cc8393d54d72c8c7e14615fe64d86fd039.tar.gz chromium_src-3a79b3cc8393d54d72c8c7e14615fe64d86fd039.tar.bz2 | |
Port DictionaryValue to use string16 instead of wstring.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10818
Review URL: http://codereview.chromium.org/31014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10833 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index fc4513c..07c87fc 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -144,16 +144,22 @@ void HandleErrorTestParameters(const CommandLine& command_line) { struct LazyDirectoryListerCacher { LazyDirectoryListerCacher() { DictionaryValue value; - value.SetString(L"header", - l10n_util::GetString(IDS_DIRECTORY_LISTING_HEADER)); - value.SetString(L"parentDirText", - l10n_util::GetString(IDS_DIRECTORY_LISTING_PARENT)); - value.SetString(L"headerName", - l10n_util::GetString(IDS_DIRECTORY_LISTING_NAME)); - value.SetString(L"headerSize", - l10n_util::GetString(IDS_DIRECTORY_LISTING_SIZE)); - value.SetString(L"headerDateModified", - l10n_util::GetString(IDS_DIRECTORY_LISTING_DATE_MODIFIED)); + value.SetString( + ASCIIToUTF16("header"), + WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_HEADER))); + value.SetString( + ASCIIToUTF16("parentDirText"), + WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_PARENT))); + value.SetString( + ASCIIToUTF16("headerName"), + WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_NAME))); + value.SetString( + ASCIIToUTF16("headerSize"), + WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_SIZE))); + value.SetString( + ASCIIToUTF16("headerDateModified"), + WideToUTF16Hack( + l10n_util::GetString(IDS_DIRECTORY_LISTING_DATE_MODIFIED))); html_data = jstemplate_builder::GetTemplateHtml( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_DIR_HEADER_HTML), @@ -508,8 +514,8 @@ int BrowserMain(const MainFunctionParams& parameters) { MetricsService* metrics = NULL; if (!parsed_command_line.HasSwitch(switches::kDisableMetrics)) { if (parsed_command_line.HasSwitch(switches::kMetricsRecordingOnly)) { - local_state->transient()->SetBoolean(prefs::kMetricsReportingEnabled, - false); + local_state->transient()->SetBoolean( + WideToUTF16Hack(prefs::kMetricsReportingEnabled), false); } metrics = browser_process->metrics_service(); DCHECK(metrics); |