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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, | 307 IDS_OPTIONS_SAFEBROWSING_ENABLEPROTECTION }, |
308 { "safeBrowsingEnableExtendedReporting", | 308 { "safeBrowsingEnableExtendedReporting", |
309 IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING }, | 309 IDS_OPTIONS_SAFEBROWSING_ENABLE_EXTENDED_REPORTING }, |
310 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, | 310 { "sectionTitleAppearance", IDS_APPEARANCE_GROUP_NAME }, |
311 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, | 311 { "sectionTitleDefaultBrowser", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, |
312 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, | 312 { "sectionTitleUsers", IDS_PROFILES_OPTIONS_GROUP_NAME }, |
313 { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME }, | 313 { "sectionTitleProxy", IDS_OPTIONS_PROXY_GROUP_NAME }, |
314 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, | 314 { "sectionTitleSearch", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, |
315 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, | 315 { "sectionTitleStartup", IDS_OPTIONS_STARTUP_GROUP_NAME }, |
316 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, | 316 { "sectionTitleSync", IDS_SYNC_OPTIONS_GROUP_NAME }, |
| 317 { "sectionTitleVoice", IDS_OPTIONS_VOICE_GROUP_NAME }, |
317 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, | 318 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, |
318 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, | 319 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, |
319 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, | 320 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, |
320 { "spellingPref", IDS_OPTIONS_SPELLING_PREF }, | 321 { "spellingPref", IDS_OPTIONS_SPELLING_PREF }, |
321 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, | 322 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, |
322 { "settingsTitle", IDS_SETTINGS_TITLE }, | 323 { "settingsTitle", IDS_SETTINGS_TITLE }, |
323 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, | 324 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, |
324 { "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES }, | 325 { "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES }, |
325 { "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB }, | 326 { "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB }, |
326 { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES }, | 327 { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES }, |
(...skipping 1473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1800 extension = extensions::GetExtensionOverridingProxy( | 1801 extension = extensions::GetExtensionOverridingProxy( |
1801 Profile::FromWebUI(web_ui())); | 1802 Profile::FromWebUI(web_ui())); |
1802 AppendExtensionData("proxy", extension, &extension_controlled); | 1803 AppendExtensionData("proxy", extension, &extension_controlled); |
1803 | 1804 |
1804 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1805 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
1805 extension_controlled); | 1806 extension_controlled); |
1806 #endif // defined(OS_WIN) | 1807 #endif // defined(OS_WIN) |
1807 } | 1808 } |
1808 | 1809 |
1809 } // namespace options | 1810 } // namespace options |
OLD | NEW |