Convert occurrences of WideToUTF{8,16}(l10n_util::GetString...() ...
... to l10n::GetString...UTF{8,16}().
BUG=23581
TEST=builds and tests pass
Review URL: http://codereview.chromium.org/3054052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55371 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm
index 6a55995..de6e8ee 100644
--- a/chrome/browser/automation/automation_provider_mac.mm
+++ b/chrome/browser/automation/automation_provider_mac.mm
@@ -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.
@@ -134,8 +134,8 @@
}
// If we don't yet have a title, use "Untitled".
if (![title length]) {
- text->assign(WideToUTF16(l10n_util::GetString(
- IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED)));
+ text->assign(l10n_util::GetStringUTF16(
+ IDS_BROWSER_WINDOW_MAC_TAB_UNTITLED));
return;
}
diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
index 0f4c336..e1e536e 100644
--- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc
@@ -235,7 +235,7 @@
list->Append(GetNetwork(
ethernet_network.service_path(),
icon,
- WideToASCII(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)),
+ l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET),
ethernet_network.connecting(),
ethernet_network.connected(),
chromeos::TYPE_ETHERNET,
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 445bb384..b62d8e07 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -465,7 +465,7 @@
static int big_progress_icon_size = 0;
if (big_progress_icon_size == 0) {
string16 locale_size_str =
- WideToUTF16Hack(l10n_util::GetString(IDS_DOWNLOAD_BIG_PROGRESS_SIZE));
+ l10n_util::GetStringUTF16(IDS_DOWNLOAD_BIG_PROGRESS_SIZE);
bool rc = base::StringToInt(locale_size_str, &big_progress_icon_size);
if (!rc || big_progress_icon_size < kBigProgressIconSize) {
NOTREACHED();
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 993d533..357c0f7 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -1266,13 +1266,13 @@
if (add_extra_extension)
file_type_info.extensions[0].push_back(extra_extension);
file_type_info.extension_description_overrides.push_back(
- WideToUTF16(l10n_util::GetString(IDS_SAVE_PAGE_DESC_HTML_ONLY)));
+ l10n_util::GetStringUTF16(IDS_SAVE_PAGE_DESC_HTML_ONLY));
file_type_info.extensions[1].push_back(FILE_PATH_LITERAL("htm"));
file_type_info.extensions[1].push_back(FILE_PATH_LITERAL("html"));
if (add_extra_extension)
file_type_info.extensions[1].push_back(extra_extension);
file_type_info.extension_description_overrides.push_back(
- WideToUTF16(l10n_util::GetString(IDS_SAVE_PAGE_DESC_COMPLETE)));
+ l10n_util::GetStringUTF16(IDS_SAVE_PAGE_DESC_COMPLETE));
file_type_info.include_all_files = false;
default_extension = kDefaultHtmlExtension;
} else {
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index f5f4d7f0..047f48d 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -214,7 +214,7 @@
gtk_widget_set_tooltip_text(
wrench_button,
l10n_util::GetStringFUTF8(IDS_APPMENU_TOOLTIP,
- WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME))).c_str());
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str());
g_signal_connect(wrench_button, "button-press-event",
G_CALLBACK(OnMenuButtonPressEventThunk), this);
GTK_WIDGET_UNSET_FLAGS(wrench_button, GTK_CAN_FOCUS);
diff --git a/chrome/browser/gtk/dialogs_gtk.cc b/chrome/browser/gtk/dialogs_gtk.cc
index aaeebd3..e5aebbf 100644
--- a/chrome/browser/gtk/dialogs_gtk.cc
+++ b/chrome/browser/gtk/dialogs_gtk.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.
@@ -284,7 +284,7 @@
GtkFileFilter* filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "*");
gtk_file_filter_set_name(filter,
- WideToUTF8(l10n_util::GetString(IDS_SAVEAS_ALL_FILES)).c_str());
+ l10n_util::GetStringUTF8(IDS_SAVEAS_ALL_FILES).c_str());
gtk_file_chooser_add_filter(chooser, filter);
}
}
diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc
index 9fb49b15..b66abf0 100644
--- a/chrome/browser/gtk/extension_install_prompt_gtk.cc
+++ b/chrome/browser/gtk/extension_install_prompt_gtk.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.
@@ -84,8 +84,8 @@
gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0);
int heading_id = ExtensionInstallUI::kHeadingIds[type];
- std::string heading_text = WideToUTF8(l10n_util::GetStringF(
- heading_id, UTF8ToWide(extension->name())));
+ std::string heading_text = l10n_util::GetStringFUTF8(
+ heading_id, UTF8ToUTF16(extension->name()));
GtkWidget* heading_label = MakeMarkupLabel("<span weight=\"bold\">%s</span>",
heading_text);
gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/gtk/extension_installed_bubble_gtk.cc
index 37a3c02..e048f1e9 100644
--- a/chrome/browser/gtk/extension_installed_bubble_gtk.cc
+++ b/chrome/browser/gtk/extension_installed_bubble_gtk.cc
@@ -158,9 +158,8 @@
// Heading label
GtkWidget* heading_label = gtk_label_new(NULL);
- std::string heading_text = WideToUTF8(l10n_util::GetStringF(
- IDS_EXTENSION_INSTALLED_HEADING,
- UTF8ToWide(extension_->name())));
+ std::string heading_text = l10n_util::GetStringFUTF8(
+ IDS_EXTENSION_INSTALLED_HEADING, UTF8ToUTF16(extension_->name()));
char* markup = g_markup_printf_escaped("<span size=\"larger\">%s</span>",
heading_text.c_str());
gtk_label_set_markup(GTK_LABEL(heading_label), markup);
@@ -172,9 +171,8 @@
// Page action label
if (type_ == ExtensionInstalledBubbleGtk::PAGE_ACTION) {
- GtkWidget* info_label = gtk_label_new(
- WideToUTF8(l10n_util::GetString(
- IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO)).c_str());
+ GtkWidget* info_label = gtk_label_new(l10n_util::GetStringUTF8(
+ IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO).c_str());
gtk_label_set_line_wrap(GTK_LABEL(info_label), TRUE);
gtk_widget_set_size_request(info_label, kTextColumnWidth, -1);
gtk_box_pack_start(GTK_BOX(text_column), info_label, FALSE, FALSE, 0);
@@ -182,8 +180,8 @@
// Manage label
GtkWidget* manage_label = gtk_label_new(
- WideToUTF8(l10n_util::GetStringF(IDS_EXTENSION_INSTALLED_MANAGE_INFO,
- UTF8ToWide(extension_->name()))).c_str());
+ l10n_util::GetStringFUTF8(IDS_EXTENSION_INSTALLED_MANAGE_INFO,
+ UTF8ToUTF16(extension_->name())).c_str());
gtk_label_set_line_wrap(GTK_LABEL(manage_label), TRUE);
gtk_widget_set_size_request(manage_label, kTextColumnWidth, -1);
gtk_box_pack_start(GTK_BOX(text_column), manage_label, FALSE, FALSE, 0);
diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc
index 3b370eb..6b1e43a7 100644
--- a/chrome/browser/gtk/options/options_window_gtk.cc
+++ b/chrome/browser/gtk/options/options_window_gtk.cc
@@ -99,7 +99,7 @@
std::string dialog_name =
l10n_util::GetStringFUTF8(
IDS_OPTIONS_DIALOG_TITLE,
- WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME)));
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
dialog_ = gtk_dialog_new_with_buttons(
dialog_name.c_str(),
// Prefs window is shared between all browser windows.
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 7d8c66a..a7e5deb9 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -315,7 +315,7 @@
// TODO(arv): This needs to get the data from some configurable place.
// http://crbug.com/17630
bool added = false;
- GURL welcome_url(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL)));
+ GURL welcome_url(l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL));
if (urls->size() < kTopSitesNumber && IndexOf(*urls, welcome_url) == -1) {
MostVisitedURL url = {
welcome_url,
@@ -327,7 +327,7 @@
added = true;
}
- GURL themes_url(WideToUTF8(l10n_util::GetString(IDS_THEMES_GALLERY_URL)));
+ GURL themes_url(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL));
if (urls->size() < kTopSitesNumber && IndexOf(*urls, themes_url) == -1) {
MostVisitedURL url = {
themes_url,
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index 94db4f2..b685319 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.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.
@@ -46,10 +46,10 @@
size_t number_of_callbacks() {return number_of_callbacks_; }
// Prepopulated URLs - added at the back of TopSites.
GURL welcome_url() {
- return GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL)));
+ return GURL(l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL));
}
GURL themes_url() {
- return GURL(WideToUTF8(l10n_util::GetString(IDS_THEMES_GALLERY_URL)));
+ return GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL));
}
virtual void SetUp() {
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 5eb62d6a..b8231be 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.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.
@@ -197,8 +197,8 @@
}
void FlowHandler::ShowSetupDone(const std::wstring& user) {
- StringValue synced_to_string(WideToUTF8(l10n_util::GetStringF(
- IDS_SYNC_NTP_SYNCED_TO, user)));
+ StringValue synced_to_string(l10n_util::GetStringFUTF8(
+ IDS_SYNC_NTP_SYNCED_TO, WideToUTF16Hack(user)));
std::string json;
base::JSONWriter::Write(&synced_to_string, false, &json);
std::wstring javascript = std::wstring(L"setSyncedToUser") +
diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc
index 71312bbe..5fe6094 100644
--- a/chrome/common/common_glue.cc
+++ b/chrome/common/common_glue.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
@@ -43,7 +43,7 @@
}
string16 GetLocalizedString(int message_id) {
- return WideToUTF16(l10n_util::GetString(message_id));
+ return l10n_util::GetStringUTF16(message_id);
}
} // namespace webkit_glue
diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc
index 2d5b9902..4732cdb 100644
--- a/chrome/common/time_format.cc
+++ b/chrome/common/time_format.cc
@@ -204,7 +204,7 @@
icu::UnicodeString pattern;
for (size_t j = 0; j < arraysize(kKeywords); ++j) {
int msg_id = message_ids.ids[i][j];
- std::string sub_pattern = WideToUTF8(l10n_util::GetString(msg_id));
+ std::string sub_pattern = l10n_util::GetStringUTF8(msg_id);
// NA means this keyword is not used in the current locale.
// Even if a translator translated for this keyword, we do not
// use it unless it's 'other' (j=0) or it's defined in the rules
