summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 00:03:20 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 00:03:20 +0000
commit4ecd01b126c1f85f89ad03a587e9c2d12b088242 (patch)
tree64a2774ef34dcf676ea675d92d232a55c08549b5 /chrome/browser/extensions
parent9f26807d1f2ee9d05880213771add3fb768b5579 (diff)
downloadchromium_src-4ecd01b126c1f85f89ad03a587e9c2d12b088242.zip
chromium_src-4ecd01b126c1f85f89ad03a587e9c2d12b088242.tar.gz
chromium_src-4ecd01b126c1f85f89ad03a587e9c2d12b088242.tar.bz2
Disable network speech on Chrome OS temporarily.
BUG=314799 NOTRY=true Review URL: https://codereview.chromium.org/55293006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/component_loader.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 4bf33b1..558260b 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -551,7 +551,9 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
#endif
#if defined(GOOGLE_CHROME_BUILD)
+#if !defined(OS_CHROMEOS) // http://crbug.com/314799
AddNetworkSpeechSynthesisExtension();
+#endif
#endif // defined(GOOGLE_CHROME_BUILD)
}