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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 11358083: Decouple c/b/cros/audio from c/b/speech. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/chromeos/audio/audio_mixer_cras.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 8c1a5c3b6a1ada990ad82300ecb67e50735a0c2e..e44f278989fd115db89afc67892d0febbf90e7f3 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -67,6 +67,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/signin/token_service_factory.h"
+#include "chrome/browser/speech/extension_api/tts_extension_api_chromeos.h"
#include "chrome/browser/system_monitor/removable_device_notifications_chromeos.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
@@ -329,7 +330,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
// Threads are initialized MainMessageLoopStart and MainMessageLoopRun.
void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
- chromeos::AudioHandler::Initialize();
+ chromeos::AudioHandler::Initialize(base::Bind(&EnableChromeOsTts));
chromeos::imageburner::BurnManager::Initialize();
// Listen for system key events so that the user will be able to adjust the
« no previous file with comments | « chrome/browser/chromeos/audio/audio_mixer_cras.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698