| OLD | NEW |
| 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/browser_options_handler2.h" | 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, | 169 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, |
| 170 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, | 170 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, |
| 171 { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL }, | 171 { "customizeSync", IDS_OPTIONS2_CUSTOMIZE_SYNC_BUTTON_LABEL }, |
| 172 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, | 172 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, |
| 173 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, | 173 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, |
| 174 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, | 174 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, |
| 175 #if defined(OS_CHROMEOS) | 175 #if defined(OS_CHROMEOS) |
| 176 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, | 176 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, |
| 177 #endif | 177 #endif |
| 178 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, | 178 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, |
| 179 { "displayOptionsButton", IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_TAB_TITLE }, |
| 180 { "displayOptionsTitle", IDS_OPTIONS_SETTINGS_SECTION_TITLE_DISPLAY }, |
| 179 { "downloadLocationAskForSaveLocation", | 181 { "downloadLocationAskForSaveLocation", |
| 180 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, | 182 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, |
| 181 { "downloadLocationBrowseTitle", | 183 { "downloadLocationBrowseTitle", |
| 182 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, | 184 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, |
| 183 { "downloadLocationChangeButton", | 185 { "downloadLocationChangeButton", |
| 184 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, | 186 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, |
| 185 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, | 187 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, |
| 186 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, | 188 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, |
| 187 { "fontSettingsCustomizeFontsButton", | 189 { "fontSettingsCustomizeFontsButton", |
| 188 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, | 190 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, |
| (...skipping 1227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1416 } | 1418 } |
| 1417 | 1419 |
| 1418 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 1420 void BrowserOptionsHandler::SetupSSLConfigSettings() { |
| 1419 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 1421 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); |
| 1420 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 1422 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); |
| 1421 web_ui()->CallJavascriptFunction( | 1423 web_ui()->CallJavascriptFunction( |
| 1422 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 1424 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); |
| 1423 } | 1425 } |
| 1424 | 1426 |
| 1425 } // namespace options2 | 1427 } // namespace options2 |
| OLD | NEW |