diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 02:35:51 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-25 02:35:51 +0000 |
| commit | e99a988a6345c7a1fabee2779918d0b0a152456a (patch) | |
| tree | 684a8403b053730ec66ec11c5d6e616c44cd964e /chrome/browser/ui/startup/bad_flags_prompt.cc | |
| parent | 308520c2909416eab488103bc5e4531c7a90dbfe (diff) | |
| download | chromium_src-e99a988a6345c7a1fabee2779918d0b0a152456a.zip chromium_src-e99a988a6345c7a1fabee2779918d0b0a152456a.tar.gz chromium_src-e99a988a6345c7a1fabee2779918d0b0a152456a.tar.bz2 | |
Only enable speech dispatcher on Linux with an explicit switch.
Now that the speechSynthesis api is part of the drive-by web, we don't
want just visiting a malicious site to be able to cause speech-dispatcher
to crash.
BUG=327295,333003
Review URL: https://codereview.chromium.org/209393004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/startup/bad_flags_prompt.cc')
| -rw-r--r-- | chrome/browser/ui/startup/bad_flags_prompt.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc index 5779c99..4236f62 100644 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc @@ -51,9 +51,9 @@ void ShowBadFlagsPrompt(Browser* browser) { // These flags undermine HTTPS / connection security. switches::kDisableUserMediaSecurity, - #if defined(ENABLE_WEBRTC) +#if defined(ENABLE_WEBRTC) switches::kDisableWebRtcEncryption, - #endif +#endif switches::kIgnoreCertificateErrors, switches::kReduceSecurityForTesting, switches::kSyncAllowInsecureXmppConnection, @@ -65,6 +65,12 @@ void ShowBadFlagsPrompt(Browser* browser) { // This flag gives extensions more powers. extensions::switches::kExtensionsOnChromeURLs, + +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) + // Speech dispatcher is buggy, it can crash and it can make Chrome freeze. + // http://crbug.com/327295 + switches::kEnableSpeechDispatcher, +#endif NULL }; |