Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: chrome/renderer/localized_error.cc

Issue 6793045: Change text of DNS prefetch option to Network prediction option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove trailing period Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/test/functional/enterprise.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 } 475 }
476 } 476 }
477 477
478 if (options.suggestions & SUGGEST_CHECK_CONNECTION) { 478 if (options.suggestions & SUGGEST_CHECK_CONNECTION) {
479 DictionaryValue* suggest_check_connection = new DictionaryValue; 479 DictionaryValue* suggest_check_connection = new DictionaryValue;
480 suggest_check_connection->SetString("msg", 480 suggest_check_connection->SetString("msg",
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) {
jar (doing other things) 2011/04/05 18:52:32 I suspect that all appearances of dns (upper and l
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_dns_prefetch = new DictionaryValue;
492 suggest_dns_prefetch->SetString("msg", 492 suggest_dns_prefetch->SetString("msg",
493 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_PREFETCH)); 493 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_PREFETCH));
494 suggest_dns_prefetch->SetString("settingsTitle", 494 suggest_dns_prefetch->SetString("settingsTitle",
495 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); 495 l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
496 suggest_dns_prefetch->SetString("advancedTitle", 496 suggest_dns_prefetch->SetString("advancedTitle",
497 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL)); 497 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL));
498 // TODO(cbentzel): What should happen here?
498 suggest_dns_prefetch->SetString( 499 suggest_dns_prefetch->SetString(
499 "noPrefetchTitle", 500 "noPrefetchTitle",
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", suggest_dns_prefetch);
503 } 504 }
504 505
505 if (options.suggestions & SUGGEST_FIREWALL_CONFIG) { 506 if (options.suggestions & SUGGEST_FIREWALL_CONFIG) {
506 DictionaryValue* suggest_firewall_config = new DictionaryValue; 507 DictionaryValue* suggest_firewall_config = new DictionaryValue;
507 suggest_firewall_config->SetString("msg", 508 suggest_firewall_config->SetString("msg",
508 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG)); 509 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG));
509 suggest_firewall_config->SetString("productName", 510 suggest_firewall_config->SetString("productName",
510 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 511 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
511 error_strings->Set("suggestionsFirewallConfig", suggest_firewall_config); 512 error_strings->Set("suggestionsFirewallConfig", suggest_firewall_config);
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 failed_url.c_str())); 603 failed_url.c_str()));
603 604
604 error_strings->SetString("title", app->name()); 605 error_strings->SetString("title", app->name());
605 error_strings->SetString("icon", 606 error_strings->SetString("icon",
606 app->GetIconURL(Extension::EXTENSION_ICON_LARGE, 607 app->GetIconURL(Extension::EXTENSION_ICON_LARGE,
607 ExtensionIconSet::MATCH_SMALLER).spec()); 608 ExtensionIconSet::MATCH_SMALLER).spec());
608 error_strings->SetString("name", app->name()); 609 error_strings->SetString("name", app->name());
609 error_strings->SetString("msg", 610 error_strings->SetString("msg",
610 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING)); 611 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING));
611 } 612 }
OLDNEW
« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/test/functional/enterprise.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698