summaryrefslogtreecommitdiffstats
path: root/chrome/common/localized_error.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 20:29:27 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-18 20:29:27 +0000
commita371b4bd10e871e13efc4a2c53b3e26b8e8d9ef0 (patch)
treef551a98ccf6e9b91cebc5c35fc25b1dc13174413 /chrome/common/localized_error.cc
parent59e69e745ba3fa290ff3c50e65c3db03ee9dde6b (diff)
downloadchromium_src-a371b4bd10e871e13efc4a2c53b3e26b8e8d9ef0.zip
chromium_src-a371b4bd10e871e13efc4a2c53b3e26b8e8d9ef0.tar.gz
chromium_src-a371b4bd10e871e13efc4a2c53b3e26b8e8d9ef0.tar.bz2
Make chrome/common and chrome/renderer use base namespace for Value.
R=avi@chromium.org Review URL: https://codereview.chromium.org/16923013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/localized_error.cc')
-rw-r--r--chrome/common/localized_error.cc37
1 files changed, 20 insertions, 17 deletions
diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc
index bba0d69..07e223c 100644
--- a/chrome/common/localized_error.cc
+++ b/chrome/common/localized_error.cc
@@ -411,8 +411,8 @@ bool LocaleIsRTL() {
// Returns a dictionary containing the strings for the settings menu under the
// wrench, and the advanced settings button.
-DictionaryValue* GetStandardMenuItemsText() {
- DictionaryValue* standard_menu_items_text = new DictionaryValue();
+base::DictionaryValue* GetStandardMenuItemsText() {
+ base::DictionaryValue* standard_menu_items_text = new base::DictionaryValue();
standard_menu_items_text->SetString("settingsTitle",
l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
standard_menu_items_text->SetString("advancedTitle",
@@ -427,7 +427,7 @@ const char LocalizedError::kHttpErrorDomain[] = "http";
void LocalizedError::GetStrings(const WebKit::WebURLError& error,
bool is_post,
const std::string& locale,
- DictionaryValue* error_strings) {
+ base::DictionaryValue* error_strings) {
bool rtl = LocaleIsRTL();
error_strings->SetString("textdirection", rtl ? "rtl" : "ltr");
@@ -474,7 +474,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
error_strings->SetString("heading",
l10n_util::GetStringUTF16(options.heading_resource_id));
- DictionaryValue* summary = new DictionaryValue;
+ base::DictionaryValue* summary = new base::DictionaryValue;
summary->SetString("msg",
l10n_util::GetStringUTF16(options.summary_resource_id));
// TODO(tc): We want the unicode url and host here since they're being
@@ -543,7 +543,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
if (options.suggestions & SUGGEST_RELOAD) {
if (!is_post) {
- DictionaryValue* reload_button = new DictionaryValue;
+ base::DictionaryValue* reload_button = new base::DictionaryValue;
reload_button->SetString("msg",
l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD));
reload_button->SetString("reloadUrl", failed_url_string);
@@ -553,7 +553,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
// way, so just add a suggestion instead.
// TODO(mmenke): Make the reload button bring up the repost confirmation
// dialog for pages resulting from posts.
- DictionaryValue* suggest_reload_repost = new DictionaryValue;
+ base::DictionaryValue* suggest_reload_repost = new base::DictionaryValue;
suggest_reload_repost->SetString("header",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_HEADER));
@@ -565,7 +565,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_CHECK_CONNECTION) {
- DictionaryValue* suggest_check_connection = new DictionaryValue;
+ base::DictionaryValue* suggest_check_connection = new base::DictionaryValue;
suggest_check_connection->SetString("header",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER));
@@ -576,7 +576,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_DNS_CONFIG) {
- DictionaryValue* suggest_dns_config = new DictionaryValue;
+ base::DictionaryValue* suggest_dns_config = new base::DictionaryValue;
suggest_dns_config->SetString("header",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER));
@@ -585,7 +585,8 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_BODY));
suggestions->Append(suggest_dns_config);
- DictionaryValue* suggest_network_prediction = GetStandardMenuItemsText();
+ base::DictionaryValue* suggest_network_prediction =
+ GetStandardMenuItemsText();
suggest_network_prediction->SetString("header",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_HEADER));
@@ -600,7 +601,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_FIREWALL_CONFIG) {
- DictionaryValue* suggest_firewall_config = new DictionaryValue;
+ base::DictionaryValue* suggest_firewall_config = new base::DictionaryValue;
suggest_firewall_config->SetString("header",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER));
@@ -611,7 +612,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_PROXY_CONFIG) {
- DictionaryValue* suggest_proxy_config = GetStandardMenuItemsText();
+ base::DictionaryValue* suggest_proxy_config = GetStandardMenuItemsText();
suggest_proxy_config->SetString("header",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER));
@@ -626,7 +627,8 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_DISABLE_EXTENSION) {
- DictionaryValue* suggest_disable_extension = new DictionaryValue;
+ base::DictionaryValue* suggest_disable_extension =
+ new base::DictionaryValue;
// There's only a header for this suggestion.
suggest_disable_extension->SetString("header",
l10n_util::GetStringUTF16(
@@ -635,7 +637,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_VIEW_POLICIES) {
- DictionaryValue* suggest_view_policies = new DictionaryValue;
+ base::DictionaryValue* suggest_view_policies = new base::DictionaryValue;
suggest_view_policies->SetString(
"header",
l10n_util::GetStringUTF16(
@@ -648,7 +650,8 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
}
if (options.suggestions & SUGGEST_CONTACT_ADMINISTRATOR) {
- DictionaryValue* suggest_contant_administrator = new DictionaryValue;
+ base::DictionaryValue* suggest_contant_administrator =
+ new base::DictionaryValue;
suggest_contant_administrator->SetString(
"body",
l10n_util::GetStringUTF16(
@@ -676,7 +679,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
repl.SetQueryStr(query);
learn_more_url = learn_more_url.ReplaceComponents(repl);
- DictionaryValue* suggest_learn_more = new DictionaryValue;
+ base::DictionaryValue* suggest_learn_more = new base::DictionaryValue;
// There's only a body for this suggestion.
suggest_learn_more->SetString("body",
l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
@@ -710,7 +713,7 @@ void LocalizedError::GetAppErrorStrings(
const WebURLError& error,
const GURL& display_url,
const extensions::Extension* app,
- DictionaryValue* error_strings) {
+ base::DictionaryValue* error_strings) {
DCHECK(app);
bool rtl = LocaleIsRTL();
@@ -738,7 +741,7 @@ void LocalizedError::GetAppErrorStrings(
#if defined(OS_CHROMEOS)
GURL learn_more_url(kAppWarningLearnMoreUrl);
- DictionaryValue* suggest_learn_more = new DictionaryValue();
+ base::DictionaryValue* suggest_learn_more = new base::DictionaryValue();
suggest_learn_more->SetString("msg",
l10n_util::GetStringUTF16(
IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
generated by cgit v1.1 at 2025-03-12 10:38:40 +0000