diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 22:59:43 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 22:59:43 +0000 |
| commit | 8e50b600ed1e65789109022709cf5c349748fb4c (patch) | |
| tree | d9d57344003604647e1a96a56ef4d21921ec44c0 /chrome/browser/browser_main.cc | |
| parent | 0c8a8f7aa683ae7d6c8ba176c1db704cc294defb (diff) | |
| download | chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.zip chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.gz chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.bz2 | |
revert broken change 10833
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10837 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, 12 insertions, 18 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 07c87fc..fc4513c 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -144,22 +144,16 @@ void HandleErrorTestParameters(const CommandLine& command_line) { struct LazyDirectoryListerCacher { LazyDirectoryListerCacher() { DictionaryValue value; - 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))); + 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)); html_data = jstemplate_builder::GetTemplateHtml( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_DIR_HEADER_HTML), @@ -514,8 +508,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( - WideToUTF16Hack(prefs::kMetricsReportingEnabled), false); + local_state->transient()->SetBoolean(prefs::kMetricsReportingEnabled, + false); } metrics = browser_process->metrics_service(); DCHECK(metrics); |