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

Unified Diff: chrome/browser/speech/tts_message_filter.cc

Issue 448033002: Eliminate the dependency of Profile from TtsMessageFilter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
Index: chrome/browser/speech/tts_message_filter.cc
diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc
index 791dfec8751c879065781da71ae8b7d542a3ec2f..d63bd1d91118605656a740f85eeafec8b6dc7d20 100644
--- a/chrome/browser/speech/tts_message_filter.cc
+++ b/chrome/browser/speech/tts_message_filter.cc
@@ -11,10 +11,9 @@
using content::BrowserThread;
-TtsMessageFilter::TtsMessageFilter(int render_process_id, Profile* profile)
+TtsMessageFilter::TtsMessageFilter(int render_process_id)
: BrowserMessageFilter(TtsMsgStart),
- render_process_id_(render_process_id),
- profile_(profile) {
+ render_process_id_(render_process_id) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
TtsController::GetInstance()->AddVoicesChangedDelegate(this);
}
@@ -59,7 +58,9 @@ void TtsMessageFilter::OnInitializeVoiceList() {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
TtsController* tts_controller = TtsController::GetInstance();
std::vector<VoiceData> voices;
- tts_controller->GetVoices(profile_, &voices);
+ tts_controller->GetVoices(
+ tts_controller->GetTtsEngineDelegate()->GetProfile(render_process_id_),
+ &voices);
std::vector<TtsVoice> out_voices;
out_voices.resize(voices.size());
@@ -76,7 +77,10 @@ void TtsMessageFilter::OnInitializeVoiceList() {
void TtsMessageFilter::OnSpeak(const TtsUtteranceRequest& request) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- scoped_ptr<Utterance> utterance(new Utterance(profile_));
+ TtsController* tts_controller = TtsController::GetInstance();
+
+ scoped_ptr<Utterance> utterance(new Utterance(
+ tts_controller->GetTtsEngineDelegate()->GetProfile(render_process_id_)));
utterance->set_src_id(request.id);
utterance->set_text(request.text);
utterance->set_lang(request.lang);
« chrome/browser/speech/tts_controller_impl.cc ('K') | « chrome/browser/speech/tts_message_filter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698