| 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/options/browser_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/browser_options_handler.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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, | 174 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, |
| 175 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, | 175 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, |
| 176 #if defined(OS_CHROMEOS) | 176 #if defined(OS_CHROMEOS) |
| 177 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, | 177 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, |
| 178 #endif | 178 #endif |
| 179 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, | 179 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, |
| 180 #if defined(OS_CHROMEOS) | 180 #if defined(OS_CHROMEOS) |
| 181 { "displayOptions", | 181 { "displayOptions", |
| 182 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL }, | 182 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_BUTTON_LABEL }, |
| 183 #endif | 183 #endif |
| 184 { "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK }, |
| 185 { "doNotTrackConfirmMessage", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TEXT }, |
| 186 { "doNotTrackConfirmTitle", IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE }, |
| 187 { "doNotTrackConfirmEnable", |
| 188 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_ENABLE }, |
| 189 { "doNotTrackConfirmDisable", |
| 190 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE }, |
| 184 { "downloadLocationAskForSaveLocation", | 191 { "downloadLocationAskForSaveLocation", |
| 185 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, | 192 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, |
| 186 { "downloadLocationBrowseTitle", | 193 { "downloadLocationBrowseTitle", |
| 187 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, | 194 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, |
| 188 { "downloadLocationChangeButton", | 195 { "downloadLocationChangeButton", |
| 189 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, | 196 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, |
| 190 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, | 197 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, |
| 191 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, | 198 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, |
| 192 { "fontSettingsCustomizeFontsButton", | 199 { "fontSettingsCustomizeFontsButton", |
| 193 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, | 200 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, |
| (...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1458 } | 1465 } |
| 1459 | 1466 |
| 1460 void BrowserOptionsHandler::SetupSSLConfigSettings() { | 1467 void BrowserOptionsHandler::SetupSSLConfigSettings() { |
| 1461 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); | 1468 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); |
| 1462 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); | 1469 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); |
| 1463 web_ui()->CallJavascriptFunction( | 1470 web_ui()->CallJavascriptFunction( |
| 1464 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); | 1471 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); |
| 1465 } | 1472 } |
| 1466 | 1473 |
| 1467 } // namespace options | 1474 } // namespace options |
| OLD | NEW |