summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/dom_ui/options_ui_uitest.cc10
-rw-r--r--chrome/browser/dom_ui/passwords_exceptions_handler.cc12
-rw-r--r--chrome/browser/dom_ui/personal_options_handler.cc96
-rw-r--r--chrome/browser/dom_ui/plugins_ui.cc79
-rw-r--r--chrome/browser/dom_ui/register_page_ui.cc23
5 files changed, 110 insertions, 110 deletions
diff --git a/chrome/browser/dom_ui/options_ui_uitest.cc b/chrome/browser/dom_ui/options_ui_uitest.cc
index c31b116..1d08126 100644
--- a/chrome/browser/dom_ui/options_ui_uitest.cc
+++ b/chrome/browser/dom_ui/options_ui_uitest.cc
@@ -4,6 +4,8 @@
#include "app/l10n_util.h"
#include "base/command_line.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
@@ -28,10 +30,10 @@ class OptionsUITest : public UITest {
void AssertIsOptionsPage(TabProxy* tab) {
std::wstring title;
ASSERT_TRUE(tab->GetTabTitle(&title));
- std::wstring expected_title =
- l10n_util::GetStringF(IDS_OPTIONS_DIALOG_TITLE,
- l10n_util::GetString(IDS_PRODUCT_NAME));
- ASSERT_EQ(expected_title, title);
+ string16 expected_title =
+ l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+ ASSERT_EQ(expected_title, WideToUTF16Hack(title));
}
};
diff --git a/chrome/browser/dom_ui/passwords_exceptions_handler.cc b/chrome/browser/dom_ui/passwords_exceptions_handler.cc
index 0fd3ffd..d5c7201 100644
--- a/chrome/browser/dom_ui/passwords_exceptions_handler.cc
+++ b/chrome/browser/dom_ui/passwords_exceptions_handler.cc
@@ -22,12 +22,12 @@ void PasswordsExceptionsHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
- localized_strings->SetString(L"passwordsExceptionsTitle",
- l10n_util::GetString(IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE));
- localized_strings->SetString(L"passwordsTabTitle",
- l10n_util::GetString(IDS_PASSWORDS_SHOW_PASSWORDS_TAB_TITLE));
- localized_strings->SetString(L"exceptionsTabTitle",
- l10n_util::GetString(IDS_PASSWORDS_EXCEPTIONS_TAB_TITLE));
+ localized_strings->SetString("passwordsExceptionsTitle",
+ l10n_util::GetStringUTF16(IDS_PASSWORDS_EXCEPTIONS_WINDOW_TITLE));
+ localized_strings->SetString("passwordsTabTitle",
+ l10n_util::GetStringUTF16(IDS_PASSWORDS_SHOW_PASSWORDS_TAB_TITLE));
+ localized_strings->SetString("exceptionsTabTitle",
+ l10n_util::GetStringUTF16(IDS_PASSWORDS_EXCEPTIONS_TAB_TITLE));
}
void PasswordsExceptionsHandler::RegisterMessages() {
diff --git a/chrome/browser/dom_ui/personal_options_handler.cc b/chrome/browser/dom_ui/personal_options_handler.cc
index 09bf9cc..a46f65c 100644
--- a/chrome/browser/dom_ui/personal_options_handler.cc
+++ b/chrome/browser/dom_ui/personal_options_handler.cc
@@ -34,59 +34,59 @@ void PersonalOptionsHandler::GetLocalizedValues(
DCHECK(localized_strings);
// Personal Stuff page
- localized_strings->SetString(L"sync_section",
- l10n_util::GetString(IDS_SYNC_OPTIONS_GROUP_NAME));
- localized_strings->SetString(L"sync_not_setup_info",
- l10n_util::GetStringF(IDS_SYNC_NOT_SET_UP_INFO,
- l10n_util::GetString(IDS_PRODUCT_NAME)));
- localized_strings->SetString(L"start_sync",
- l10n_util::GetString(IDS_SYNC_START_SYNC_BUTTON_LABEL));
- localized_strings->SetString(L"sync_customize",
- l10n_util::GetString(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL));
- localized_strings->SetString(L"stop_sync",
- l10n_util::GetString(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL));
+ localized_strings->SetString("sync_section",
+ l10n_util::GetStringUTF16(IDS_SYNC_OPTIONS_GROUP_NAME));
+ localized_strings->SetString("sync_not_setup_info",
+ l10n_util::GetStringFUTF16(IDS_SYNC_NOT_SET_UP_INFO,
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+ localized_strings->SetString("start_sync",
+ l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL));
+ localized_strings->SetString("sync_customize",
+ l10n_util::GetStringUTF16(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL));
+ localized_strings->SetString("stop_sync",
+ l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL));
- localized_strings->SetString(L"passwords",
- l10n_util::GetString(IDS_OPTIONS_PASSWORDS_GROUP_NAME));
- localized_strings->SetString(L"passwords_asktosave",
- l10n_util::GetString(IDS_OPTIONS_PASSWORDS_ASKTOSAVE));
- localized_strings->SetString(L"passwords_neversave",
- l10n_util::GetString(IDS_OPTIONS_PASSWORDS_NEVERSAVE));
- localized_strings->SetString(L"showpasswords",
- l10n_util::GetString(IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS));
+ localized_strings->SetString("passwords",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_GROUP_NAME));
+ localized_strings->SetString("passwords_asktosave",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_ASKTOSAVE));
+ localized_strings->SetString("passwords_neversave",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_NEVERSAVE));
+ localized_strings->SetString("showpasswords",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS));
- localized_strings->SetString(L"autofill",
- l10n_util::GetString(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME));
- localized_strings->SetString(L"autofill_options",
- l10n_util::GetString(IDS_AUTOFILL_OPTIONS));
+ localized_strings->SetString("autofill",
+ l10n_util::GetStringUTF16(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME));
+ localized_strings->SetString("autofill_options",
+ l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS));
- localized_strings->SetString(L"browsing_data",
- l10n_util::GetString(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME));
- localized_strings->SetString(L"import_data",
- l10n_util::GetString(IDS_OPTIONS_IMPORT_DATA_BUTTON));
+ localized_strings->SetString("browsing_data",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME));
+ localized_strings->SetString("import_data",
+ l10n_util::GetStringUTF16(IDS_OPTIONS_IMPORT_DATA_BUTTON));
#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
- localized_strings->SetString(L"appearance",
- l10n_util::GetString(IDS_APPEARANCE_GROUP_NAME));
- localized_strings->SetString(L"themes_GTK_button",
- l10n_util::GetString(IDS_THEMES_GTK_BUTTON));
- localized_strings->SetString(L"themes_set_classic",
- l10n_util::GetString(IDS_THEMES_SET_CLASSIC));
- localized_strings->SetString(L"showWindow_decorations_radio",
- l10n_util::GetString(IDS_SHOW_WINDOW_DECORATIONS_RADIO));
- localized_strings->SetString(L"hideWindow_decorations_radio",
- l10n_util::GetString(IDS_HIDE_WINDOW_DECORATIONS_RADIO));
- localized_strings->SetString(L"themes_gallery",
- l10n_util::GetString(IDS_THEMES_GALLERY_BUTTON));
+ localized_strings->SetString("appearance",
+ l10n_util::GetStringUTF16(IDS_APPEARANCE_GROUP_NAME));
+ localized_strings->SetString("themes_GTK_button",
+ l10n_util::GetStringUTF16(IDS_THEMES_GTK_BUTTON));
+ localized_strings->SetString("themes_set_classic",
+ l10n_util::GetStringUTF16(IDS_THEMES_SET_CLASSIC));
+ localized_strings->SetString("showWindow_decorations_radio",
+ l10n_util::GetStringUTF16(IDS_SHOW_WINDOW_DECORATIONS_RADIO));
+ localized_strings->SetString("hideWindow_decorations_radio",
+ l10n_util::GetStringUTF16(IDS_HIDE_WINDOW_DECORATIONS_RADIO));
+ localized_strings->SetString("themes_gallery",
+ l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_BUTTON));
#else
- localized_strings->SetString(L"themes",
- l10n_util::GetString(IDS_THEMES_GROUP_NAME));
- localized_strings->SetString(L"themes_reset",
- l10n_util::GetString(IDS_THEMES_RESET_BUTTON));
- localized_strings->SetString(L"themes_gallery",
- l10n_util::GetString(IDS_THEMES_GALLERY_BUTTON));
- localized_strings->SetString(L"themes_default",
- l10n_util::GetString(IDS_THEMES_DEFAULT_THEME_LABEL));
+ localized_strings->SetString("themes",
+ l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME));
+ localized_strings->SetString("themes_reset",
+ l10n_util::GetStringUTF16(IDS_THEMES_RESET_BUTTON));
+ localized_strings->SetString("themes_gallery",
+ l10n_util::GetStringUTF16(IDS_THEMES_GALLERY_BUTTON));
+ localized_strings->SetString("themes_default",
+ l10n_util::GetStringUTF16(IDS_THEMES_DEFAULT_THEME_LABEL));
#endif
}
@@ -101,7 +101,7 @@ void PersonalOptionsHandler::SetSyncStatusUIString(const Value* value) {
DCHECK(dom_ui_);
ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService();
- if(service != NULL && ProfileSyncService::IsSyncEnabled()) {
+ if (service != NULL && ProfileSyncService::IsSyncEnabled()) {
scoped_ptr<Value> status_string(Value::CreateStringValue(
l10n_util::GetStringFUTF16(IDS_SYNC_ACCOUNT_SYNCED_TO_USER_WITH_TIME,
service->GetAuthenticatedUsername(),
diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc
index 158f297..922d10e8 100644
--- a/chrome/browser/dom_ui/plugins_ui.cc
+++ b/chrome/browser/dom_ui/plugins_ui.cc
@@ -64,42 +64,42 @@ void PluginsUIHTMLSource::StartDataRequest(const std::string& path,
int request_id) {
// Strings used in the JsTemplate file.
DictionaryValue localized_strings;
- localized_strings.SetString(L"pluginsTitle",
- l10n_util::GetString(IDS_PLUGINS_TITLE));
- localized_strings.SetString(L"pluginsDetailsModeLink",
- l10n_util::GetString(IDS_PLUGINS_DETAILS_MODE_LINK));
- localized_strings.SetString(L"pluginsNoneInstalled",
- l10n_util::GetString(IDS_PLUGINS_NONE_INSTALLED));
- localized_strings.SetString(L"pluginDisabled",
- l10n_util::GetString(IDS_PLUGINS_DISABLED_PLUGIN));
- localized_strings.SetString(L"pluginDisabledByPolicy",
- l10n_util::GetString(IDS_PLUGINS_DISABLED_BY_POLICY_PLUGIN));
- localized_strings.SetString(L"pluginCannotBeEnabledDueToPolicy",
- l10n_util::GetString(IDS_PLUGINS_CANNOT_ENABLE_DUE_TO_POLICY));
- localized_strings.SetString(L"pluginDownload",
- l10n_util::GetString(IDS_PLUGINS_DOWNLOAD));
- localized_strings.SetString(L"pluginName",
- l10n_util::GetString(IDS_PLUGINS_NAME));
- localized_strings.SetString(L"pluginPriority",
- l10n_util::GetString(IDS_PLUGINS_PRIORITY));
- localized_strings.SetString(L"pluginVersion",
- l10n_util::GetString(IDS_PLUGINS_VERSION));
- localized_strings.SetString(L"pluginDescription",
- l10n_util::GetString(IDS_PLUGINS_DESCRIPTION));
- localized_strings.SetString(L"pluginPath",
- l10n_util::GetString(IDS_PLUGINS_PATH));
- localized_strings.SetString(L"pluginMimeTypes",
- l10n_util::GetString(IDS_PLUGINS_MIME_TYPES));
- localized_strings.SetString(L"pluginMimeTypesMimeType",
- l10n_util::GetString(IDS_PLUGINS_MIME_TYPES_MIME_TYPE));
- localized_strings.SetString(L"pluginMimeTypesDescription",
- l10n_util::GetString(IDS_PLUGINS_MIME_TYPES_DESCRIPTION));
- localized_strings.SetString(L"pluginMimeTypesFileExtensions",
- l10n_util::GetString(IDS_PLUGINS_MIME_TYPES_FILE_EXTENSIONS));
- localized_strings.SetString(L"disable",
- l10n_util::GetString(IDS_PLUGINS_DISABLE));
- localized_strings.SetString(L"enable",
- l10n_util::GetString(IDS_PLUGINS_ENABLE));
+ localized_strings.SetString("pluginsTitle",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_TITLE));
+ localized_strings.SetString("pluginsDetailsModeLink",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_DETAILS_MODE_LINK));
+ localized_strings.SetString("pluginsNoneInstalled",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_NONE_INSTALLED));
+ localized_strings.SetString("pluginDisabled",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_PLUGIN));
+ localized_strings.SetString("pluginDisabledByPolicy",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLED_BY_POLICY_PLUGIN));
+ localized_strings.SetString("pluginCannotBeEnabledDueToPolicy",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_CANNOT_ENABLE_DUE_TO_POLICY));
+ localized_strings.SetString("pluginDownload",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_DOWNLOAD));
+ localized_strings.SetString("pluginName",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_NAME));
+ localized_strings.SetString("pluginPriority",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_PRIORITY));
+ localized_strings.SetString("pluginVersion",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_VERSION));
+ localized_strings.SetString("pluginDescription",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_DESCRIPTION));
+ localized_strings.SetString("pluginPath",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_PATH));
+ localized_strings.SetString("pluginMimeTypes",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_MIME_TYPES));
+ localized_strings.SetString("pluginMimeTypesMimeType",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_MIME_TYPES_MIME_TYPE));
+ localized_strings.SetString("pluginMimeTypesDescription",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_MIME_TYPES_DESCRIPTION));
+ localized_strings.SetString("pluginMimeTypesFileExtensions",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_MIME_TYPES_FILE_EXTENSIONS));
+ localized_strings.SetString("disable",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_DISABLE));
+ localized_strings.SetString("enable",
+ l10n_util::GetStringUTF16(IDS_PLUGINS_ENABLE));
ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
@@ -176,7 +176,7 @@ void PluginsDOMHandler::RegisterMessages() {
void PluginsDOMHandler::HandleRequestPluginsData(const Value* value) {
DictionaryValue* results = new DictionaryValue();
- results->Set(L"plugins", plugin_updater::GetPluginGroupsData());
+ results->Set("plugins", plugin_updater::GetPluginGroupsData());
dom_ui_->CallJavascriptFunction(L"returnPluginsData", *results);
}
@@ -197,12 +197,11 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const Value* value) {
return;
if (is_group_str == "true") {
- std::wstring group_name;
+ string16 group_name;
if (!list->GetString(0, &group_name))
return;
- plugin_updater::EnablePluginGroup(enable_str == "true",
- WideToUTF16(group_name));
+ plugin_updater::EnablePluginGroup(enable_str == "true", group_name);
} else {
FilePath::StringType file_path;
if (!list->GetString(0, &file_path))
diff --git a/chrome/browser/dom_ui/register_page_ui.cc b/chrome/browser/dom_ui/register_page_ui.cc
index 466b98b..70627bc 100644
--- a/chrome/browser/dom_ui/register_page_ui.cc
+++ b/chrome/browser/dom_ui/register_page_ui.cc
@@ -29,7 +29,7 @@
namespace {
// Constant value for os_name sent in setUserInfo.
-const wchar_t kOSName[] = L"ChromeOS";
+const char kOSName[] = "ChromeOS";
} // namespace
class RegisterPageUIHTMLSource : public ChromeURLDataManager::DataSource {
@@ -213,19 +213,18 @@ void RegisterPageHandler::SendUserInfo() {
}
// Required info.
- value.SetString(L"system_hwqual", L"hardware qual identifier");
- value.SetString(L"system_sku", UTF8ToWide(system_sku));
- value.SetString(L"system_serial", L"serial number");
- value.SetString(L"os_language",
- UTF8ToWide(g_browser_process->GetApplicationLocale()));
- value.SetString(L"os_name", kOSName);
- value.SetString(L"os_version", UTF8ToWide(version_));
- value.SetString(L"os_connection", L"connection type");
- value.SetString(L"user_email", L"");
+ value.SetString("system_hwqual", "hardware qual identifier");
+ value.SetString("system_sku", system_sku);
+ value.SetString("system_serial", "serial number");
+ value.SetString("os_language", g_browser_process->GetApplicationLocale());
+ value.SetString("os_name", kOSName);
+ value.SetString("os_version", version_);
+ value.SetString("os_connection", "connection type");
+ value.SetString("user_email", "");
// Optional info.
- value.SetString(L"user_first_name", L"");
- value.SetString(L"user_last_name", L"");
+ value.SetString("user_first_name", "");
+ value.SetString("user_last_name", "");
LOG(INFO) << "Sending user info to host page";
dom_ui_->CallJavascriptFunction(L"setUserInfo", value);
generated by cgit v1.1 at 2025-05-29 05:02:53 +0000