Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Unified Diff: chrome/browser/ui/startup/bad_flags_prompt.cc

Issue 209393004: Only enable speech dispatcher on Linux with an explicit switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix indentation and comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/speech/tts_linux.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
};
« no previous file with comments | « chrome/browser/speech/tts_linux.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698