| 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY }, | 201 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY }, |
| 202 { "advancedSectionTitleSecurity", | 202 { "advancedSectionTitleSecurity", |
| 203 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY }, | 203 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY }, |
| 204 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE }, | 204 { "autofillEnabled", IDS_OPTIONS_AUTOFILL_ENABLE }, |
| 205 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN }, | 205 { "autologinEnabled", IDS_OPTIONS_PASSWORDS_AUTOLOGIN }, |
| 206 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY }, | 206 { "autoOpenFileTypesInfo", IDS_OPTIONS_OPEN_FILE_TYPES_AUTOMATICALLY }, |
| 207 { "autoOpenFileTypesResetToDefault", | 207 { "autoOpenFileTypesResetToDefault", |
| 208 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT }, | 208 IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT }, |
| 209 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, | 209 { "changeHomePage", IDS_OPTIONS_CHANGE_HOME_PAGE }, |
| 210 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, | 210 { "certificatesManageButton", IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON }, |
| 211 #if defined(ENABLE_GOOGLE_NOW) |
| 212 { "componentGeolocationEnable", IDS_OPTIONS_COMPONENT_GEOLCATION_ENABLE }, |
| 213 #endif |
| 211 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL }, | 214 { "customizeSync", IDS_OPTIONS_CUSTOMIZE_SYNC_BUTTON_LABEL }, |
| 212 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, | 215 { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL }, |
| 213 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, | 216 { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, |
| 214 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, | 217 { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL }, |
| 215 #if defined(OS_CHROMEOS) | 218 #if defined(OS_CHROMEOS) |
| 216 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, | 219 { "disableGData", IDS_OPTIONS_DISABLE_GDATA }, |
| 217 #endif | 220 #endif |
| 218 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, | 221 { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES }, |
| 219 #if defined(OS_CHROMEOS) | 222 #if defined(OS_CHROMEOS) |
| 220 { "displayOptions", | 223 { "displayOptions", |
| (...skipping 1360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1581 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || | 1584 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || |
| 1582 is_extension_controlled); | 1585 is_extension_controlled); |
| 1583 base::FundamentalValue extension_controlled(is_extension_controlled); | 1586 base::FundamentalValue extension_controlled(is_extension_controlled); |
| 1584 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", | 1587 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", |
| 1585 disabled, extension_controlled); | 1588 disabled, extension_controlled); |
| 1586 | 1589 |
| 1587 #endif // !defined(OS_CHROMEOS) | 1590 #endif // !defined(OS_CHROMEOS) |
| 1588 } | 1591 } |
| 1589 | 1592 |
| 1590 } // namespace options | 1593 } // namespace options |
| OLD | NEW |