| 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 "apps/app_window.h" | 10 #include "apps/app_window.h" |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, | 288 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, |
| 289 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, | 289 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, |
| 290 { "networkPredictionEnabledDescription", | 290 { "networkPredictionEnabledDescription", |
| 291 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, | 291 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, |
| 292 { "passwordsAndAutofillGroupName", | 292 { "passwordsAndAutofillGroupName", |
| 293 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, | 293 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, |
| 294 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, | 294 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, |
| 295 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, | 295 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, |
| 296 { "privacyContentSettingsButton", | 296 { "privacyContentSettingsButton", |
| 297 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, | 297 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, |
| 298 { "profileAddPersonEnable", IDS_PROFILE_ADD_PERSON_ENABLE }, |
| 299 { "profileBrowserGuestEnable", IDS_PROFILE_BROWSER_GUEST_ENABLE }, |
| 298 { "profilesCreate", using_new_profiles_ui ? | 300 { "profilesCreate", using_new_profiles_ui ? |
| 299 IDS_NEW_PROFILES_CREATE_BUTTON_LABEL : | 301 IDS_NEW_PROFILES_CREATE_BUTTON_LABEL : |
| 300 IDS_PROFILES_CREATE_BUTTON_LABEL }, | 302 IDS_PROFILES_CREATE_BUTTON_LABEL }, |
| 301 { "profilesDelete", using_new_profiles_ui ? | 303 { "profilesDelete", using_new_profiles_ui ? |
| 302 IDS_NEW_PROFILES_DELETE_BUTTON_LABEL : | 304 IDS_NEW_PROFILES_DELETE_BUTTON_LABEL : |
| 303 IDS_PROFILES_DELETE_BUTTON_LABEL }, | 305 IDS_PROFILES_DELETE_BUTTON_LABEL }, |
| 304 { "profilesDeleteSingle", using_new_profiles_ui ? | 306 { "profilesDeleteSingle", using_new_profiles_ui ? |
| 305 IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL : | 307 IDS_NEW_PROFILES_DELETE_SINGLE_BUTTON_LABEL : |
| 306 IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, | 308 IDS_PROFILES_DELETE_SINGLE_BUTTON_LABEL }, |
| 307 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, | 309 { "profilesListItemCurrent", IDS_PROFILES_LIST_ITEM_CURRENT }, |
| (...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1862 extension = extensions::GetExtensionOverridingProxy( | 1864 extension = extensions::GetExtensionOverridingProxy( |
| 1863 Profile::FromWebUI(web_ui())); | 1865 Profile::FromWebUI(web_ui())); |
| 1864 AppendExtensionData("proxy", extension, &extension_controlled); | 1866 AppendExtensionData("proxy", extension, &extension_controlled); |
| 1865 | 1867 |
| 1866 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1868 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
| 1867 extension_controlled); | 1869 extension_controlled); |
| 1868 #endif // defined(OS_WIN) | 1870 #endif // defined(OS_WIN) |
| 1869 } | 1871 } |
| 1870 | 1872 |
| 1871 } // namespace options | 1873 } // namespace options |
| OLD | NEW |