| Index: chrome/browser/ui/startup/bad_flags_prompt.cc
|
| diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc
|
| index 5779c99d263862c1b8176a1569ce014bc5c90c3e..4236f62b5b7f76af63c20a1f61925826267eb26a 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
|
| };
|
|
|
|
|