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

Side by Side Diff: chrome/browser/ui/webui/options2/advanced_options_handler2.cc

Issue 9235004: [Garbled Text][Infobar] Adding infobar to suggest turning on encoding detection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 11 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
« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options2/advanced_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/advanced_options_handler2.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 { "fontSizeLabelCustom", 149 { "fontSizeLabelCustom",
150 IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM }, 150 IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM },
151 { "fontSettingsCustomizeFontsButton", 151 { "fontSettingsCustomizeFontsButton",
152 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, 152 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON },
153 { "languageAndSpellCheckSettingsButton", 153 { "languageAndSpellCheckSettingsButton",
154 #if defined(OS_CHROMEOS) 154 #if defined(OS_CHROMEOS)
155 IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE }, 155 IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE },
156 #else 156 #else
157 IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON }, 157 IDS_OPTIONS_LANGUAGE_AND_SPELLCHECK_BUTTON },
158 #endif 158 #endif
159 { "advancedSectionTitleGarbledText",
160 IDS_OPTIONS_ADVANCED_SECTION_TITLE_GARBLED_TEXT },
159 { "advancedSectionTitlePrivacy", 161 { "advancedSectionTitlePrivacy",
160 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY }, 162 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY },
161 { "advancedSectionTitleContent", 163 { "advancedSectionTitleContent",
162 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT }, 164 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
163 { "advancedSectionTitleSecurity", 165 { "advancedSectionTitleSecurity",
164 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY }, 166 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY },
165 { "advancedSectionTitleNetwork", 167 { "advancedSectionTitleNetwork",
166 IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK }, 168 IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK },
167 { "advancedSectionTitleLanguages", 169 { "advancedSectionTitleLanguages",
168 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES }, 170 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES },
171 { "garbledTextEnableAutoFix",
172 IDS_OPTIONS_GARBLED_TEXT_ENABLE_AUTO_FIX },
169 { "translateEnableTranslate", 173 { "translateEnableTranslate",
170 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, 174 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
171 { "enableLogging", 175 { "enableLogging",
172 IDS_OPTIONS_ENABLE_LOGGING }, 176 IDS_OPTIONS_ENABLE_LOGGING },
173 { "improveBrowsingExperience", 177 { "improveBrowsingExperience",
174 IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE }, 178 IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
175 { "disableWebServices", 179 { "disableWebServices",
176 IDS_OPTIONS_DISABLE_WEB_SERVICES }, 180 IDS_OPTIONS_DISABLE_WEB_SERVICES },
177 { "advancedSectionTitleCloudPrint", 181 { "advancedSectionTitleCloudPrint",
178 IDS_GOOGLE_CLOUD_PRINT }, 182 IDS_GOOGLE_CLOUD_PRINT },
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 803 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
800 { 804 {
801 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 805 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
802 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 806 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
803 web_ui()->CallJavascriptFunction( 807 web_ui()->CallJavascriptFunction(
804 "AdvancedOptions.SetCheckRevocationCheckboxState", checked, disabled); 808 "AdvancedOptions.SetCheckRevocationCheckboxState", checked, disabled);
805 } 809 }
806 } 810 }
807 811
808 } // namespace options2 812 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/advanced_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698