summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-07 06:06:05 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-07 06:06:05 +0000
commit6f149b3e2d3d4f2522632533ffdf38a64bfcfb63 (patch)
treef9cae31e7b6137a5c697168161635aa631ead2cc /chrome/browser
parent15211b2f9dcc250aab01fbda8e2ee725689e0c87 (diff)
downloadchromium_src-6f149b3e2d3d4f2522632533ffdf38a64bfcfb63.zip
chromium_src-6f149b3e2d3d4f2522632533ffdf38a64bfcfb63.tar.gz
chromium_src-6f149b3e2d3d4f2522632533ffdf38a64bfcfb63.tar.bz2
Convert browser/dom_ui/d*.cc to not use wstrings/wchar_t*s.
(Well, the super-easy cases anyway.) BUG=23581 TEST=builds and tests pass Review URL: http://codereview.chromium.org/3036052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/dom_ui/devtools_ui.cc2
-rw-r--r--chrome/browser/dom_ui/downloads_ui.cc64
2 files changed, 33 insertions, 33 deletions
diff --git a/chrome/browser/dom_ui/devtools_ui.cc b/chrome/browser/dom_ui/devtools_ui.cc
index 1b76995..17946ce 100644
--- a/chrome/browser/dom_ui/devtools_ui.cc
+++ b/chrome/browser/dom_ui/devtools_ui.cc
@@ -29,7 +29,7 @@ class DevToolsMessageHandler: public DOMMessageHandler {
if ((*extension)->devtools_url().is_empty())
continue;
DictionaryValue* extension_info = new DictionaryValue();
- extension_info->Set(L"startPage",
+ extension_info->Set("startPage",
new StringValue((*extension)->devtools_url().spec()));
results.Append(extension_info);
}
diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc
index d0f3cad..2fe1067 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -57,46 +57,46 @@ void DownloadsUIHTMLSource::StartDataRequest(const std::string& path,
bool is_off_the_record,
int request_id) {
DictionaryValue localized_strings;
- localized_strings.SetString(L"title",
- l10n_util::GetString(IDS_DOWNLOAD_TITLE));
- localized_strings.SetString(L"searchbutton",
- l10n_util::GetString(IDS_DOWNLOAD_SEARCH_BUTTON));
- localized_strings.SetString(L"no_results",
- l10n_util::GetString(IDS_DOWNLOAD_SEARCH_BUTTON));
- localized_strings.SetString(L"searchresultsfor",
- l10n_util::GetString(IDS_DOWNLOAD_SEARCHRESULTSFOR));
- localized_strings.SetString(L"downloads",
- l10n_util::GetString(IDS_DOWNLOAD_TITLE));
- localized_strings.SetString(L"clear_all",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_CLEAR_ALL));
+ localized_strings.SetString("title",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE));
+ localized_strings.SetString("searchbutton",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_SEARCH_BUTTON));
+ localized_strings.SetString("no_results",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_SEARCH_BUTTON));
+ localized_strings.SetString("searchresultsfor",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_SEARCHRESULTSFOR));
+ localized_strings.SetString("downloads",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_TITLE));
+ localized_strings.SetString("clear_all",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_CLEAR_ALL));
// Status.
- localized_strings.SetString(L"status_cancelled",
- l10n_util::GetString(IDS_DOWNLOAD_TAB_CANCELED));
- localized_strings.SetString(L"status_paused",
- l10n_util::GetString(IDS_DOWNLOAD_PROGRESS_PAUSED));
+ localized_strings.SetString("status_cancelled",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_TAB_CANCELED));
+ localized_strings.SetString("status_paused",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_PROGRESS_PAUSED));
// Dangerous file.
- localized_strings.SetString(L"danger_desc",
- l10n_util::GetString(IDS_PROMPT_DANGEROUS_DOWNLOAD));
- localized_strings.SetString(L"danger_save",
- l10n_util::GetString(IDS_SAVE_DOWNLOAD));
- localized_strings.SetString(L"danger_discard",
- l10n_util::GetString(IDS_DISCARD_DOWNLOAD));
+ localized_strings.SetString("danger_desc",
+ l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD));
+ localized_strings.SetString("danger_save",
+ l10n_util::GetStringUTF16(IDS_SAVE_DOWNLOAD));
+ localized_strings.SetString("danger_discard",
+ l10n_util::GetStringUTF16(IDS_DISCARD_DOWNLOAD));
// Controls.
- localized_strings.SetString(L"control_pause",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_PAUSE));
+ localized_strings.SetString("control_pause",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_PAUSE));
if (browser_defaults::kDownloadPageHasShowInFolder) {
- localized_strings.SetString(L"control_showinfolder",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_SHOW));
+ localized_strings.SetString("control_showinfolder",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_SHOW));
}
- localized_strings.SetString(L"control_cancel",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_CANCEL));
- localized_strings.SetString(L"control_resume",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_RESUME));
- localized_strings.SetString(L"control_removefromlist",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_REMOVE));
+ localized_strings.SetString("control_cancel",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_CANCEL));
+ localized_strings.SetString("control_resume",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_RESUME));
+ localized_strings.SetString("control_removefromlist",
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_REMOVE));
SetFontAndTextDirection(&localized_strings);