Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/renderer/localized_error.h" | 5 #include "chrome/renderer/localized_error.h" |
| 6 | 6 |
| 7 #include "base/i18n/rtl.h" | 7 #include "base/i18n/rtl.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/string16.h" | 9 #include "base/string16.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 481 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION)); | 481 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION)); |
| 482 error_strings->Set("suggestionsCheckConnection", suggest_check_connection); | 482 error_strings->Set("suggestionsCheckConnection", suggest_check_connection); |
| 483 } | 483 } |
| 484 | 484 |
| 485 if (options.suggestions & SUGGEST_DNS_CONFIG) { | 485 if (options.suggestions & SUGGEST_DNS_CONFIG) { |
| 486 DictionaryValue* suggest_dns_config = new DictionaryValue; | 486 DictionaryValue* suggest_dns_config = new DictionaryValue; |
| 487 suggest_dns_config->SetString("msg", | 487 suggest_dns_config->SetString("msg", |
| 488 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG)); | 488 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG)); |
| 489 error_strings->Set("suggestionsDNSConfig", suggest_dns_config); | 489 error_strings->Set("suggestionsDNSConfig", suggest_dns_config); |
| 490 | 490 |
| 491 DictionaryValue* suggest_dns_prefetch = new DictionaryValue; | 491 DictionaryValue* suggest_network_prediction = new DictionaryValue; |
| 492 suggest_dns_prefetch->SetString("msg", | 492 suggest_network_prediction->SetString("msg", |
| 493 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_PREFETCH)); | 493 l10n_util::GetStringUTF16( |
| 494 suggest_dns_prefetch->SetString("settingsTitle", | 494 IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION)); |
| 495 suggest_network_prediction->SetString("settingsTitle", | |
| 495 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); | 496 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); |
| 496 suggest_dns_prefetch->SetString("advancedTitle", | 497 suggest_network_prediction->SetString("advancedTitle", |
| 497 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL)); | 498 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL)); |
| 498 suggest_dns_prefetch->SetString( | 499 suggest_network_prediction->SetString( |
| 499 "noPrefetchTitle", | 500 "noNetworkPredictionTitle", |
| 500 l10n_util::GetStringUTF16( | 501 l10n_util::GetStringUTF16( |
| 501 IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION)); | 502 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION)); |
| 502 error_strings->Set("suggestionsDisableDNSPrefetch", suggest_dns_prefetch); | 503 error_strings->Set("suggestionsDisableDNSPrefetch", |
|
mmenke
2011/04/05 20:50:20
You should change this string to match. The other
cbentzel
2011/04/05 21:00:45
Done.
| |
| 504 suggest_network_prediction); | |
| 503 } | 505 } |
| 504 | 506 |
| 505 if (options.suggestions & SUGGEST_FIREWALL_CONFIG) { | 507 if (options.suggestions & SUGGEST_FIREWALL_CONFIG) { |
| 506 DictionaryValue* suggest_firewall_config = new DictionaryValue; | 508 DictionaryValue* suggest_firewall_config = new DictionaryValue; |
| 507 suggest_firewall_config->SetString("msg", | 509 suggest_firewall_config->SetString("msg", |
| 508 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG)); | 510 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG)); |
| 509 suggest_firewall_config->SetString("productName", | 511 suggest_firewall_config->SetString("productName", |
| 510 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 512 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
| 511 error_strings->Set("suggestionsFirewallConfig", suggest_firewall_config); | 513 error_strings->Set("suggestionsFirewallConfig", suggest_firewall_config); |
| 512 } | 514 } |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 602 failed_url.c_str())); | 604 failed_url.c_str())); |
| 603 | 605 |
| 604 error_strings->SetString("title", app->name()); | 606 error_strings->SetString("title", app->name()); |
| 605 error_strings->SetString("icon", | 607 error_strings->SetString("icon", |
| 606 app->GetIconURL(Extension::EXTENSION_ICON_LARGE, | 608 app->GetIconURL(Extension::EXTENSION_ICON_LARGE, |
| 607 ExtensionIconSet::MATCH_SMALLER).spec()); | 609 ExtensionIconSet::MATCH_SMALLER).spec()); |
| 608 error_strings->SetString("name", app->name()); | 610 error_strings->SetString("name", app->name()); |
| 609 error_strings->SetString("msg", | 611 error_strings->SetString("msg", |
| 610 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING)); | 612 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING)); |
| 611 } | 613 } |
| OLD | NEW |