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

Side by Side Diff: chrome/browser/ui/webui/options/advanced_options_handler.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: Another bad merge fix 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/browser/ui/webui/options/advanced_options_handler.h" 5 #include "chrome/browser/ui/webui/options/advanced_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 { "safeBrowsingEnableProtection", 91 { "safeBrowsingEnableProtection",
92 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, 92 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION },
93 { "sslGroupDescription", 93 { "sslGroupDescription",
94 IDS_OPTIONS_SSL_GROUP_DESCRIPTION }, 94 IDS_OPTIONS_SSL_GROUP_DESCRIPTION },
95 { "sslCheckRevocation", 95 { "sslCheckRevocation",
96 IDS_OPTIONS_SSL_CHECKREVOCATION }, 96 IDS_OPTIONS_SSL_CHECKREVOCATION },
97 { "sslUseSSL3", 97 { "sslUseSSL3",
98 IDS_OPTIONS_SSL_USESSL3 }, 98 IDS_OPTIONS_SSL_USESSL3 },
99 { "sslUseTLS1", 99 { "sslUseTLS1",
100 IDS_OPTIONS_SSL_USETLS1 }, 100 IDS_OPTIONS_SSL_USETLS1 },
101 { "networkDNSPrefetchEnabledDescription", 101 { "networkPredictionEnabledDescription",
102 IDS_NETWORK_DNS_PREFETCH_ENABLED_DESCRIPTION }, 102 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
103 { "privacyContentSettingsButton", 103 { "privacyContentSettingsButton",
104 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 104 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
105 { "privacyClearDataButton", 105 { "privacyClearDataButton",
106 IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 106 IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
107 { "linkDoctorPref", 107 { "linkDoctorPref",
108 IDS_OPTIONS_LINKDOCTOR_PREF }, 108 IDS_OPTIONS_LINKDOCTOR_PREF },
109 { "suggestPref", 109 { "suggestPref",
110 IDS_OPTIONS_SUGGEST_PREF }, 110 IDS_OPTIONS_SUGGEST_PREF },
111 { "tabsToLinksPref", 111 { "tabsToLinksPref",
112 IDS_OPTIONS_TABS_TO_LINKS_PREF }, 112 IDS_OPTIONS_TABS_TO_LINKS_PREF },
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 web_ui_->CallJavascriptFunction( 625 web_ui_->CallJavascriptFunction(
626 "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled); 626 "options.AdvancedOptions.SetUseSSL3CheckboxState", checked, disabled);
627 } 627 }
628 { 628 {
629 FundamentalValue checked(tls1_enabled_.GetValue()); 629 FundamentalValue checked(tls1_enabled_.GetValue());
630 FundamentalValue disabled(tls1_enabled_.IsManaged()); 630 FundamentalValue disabled(tls1_enabled_.IsManaged());
631 web_ui_->CallJavascriptFunction( 631 web_ui_->CallJavascriptFunction(
632 "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled); 632 "options.AdvancedOptions.SetUseTLS1CheckboxState", checked, disabled);
633 } 633 }
634 } 634 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698