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

Side by Side Diff: chrome/browser/speech/tts_controller_impl.cc

Issue 647343004: Only send TTS VoicesChanged callbacks when TTS has been explicitly requested. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/speech/tts_controller_impl.h" 5 #include "chrome/browser/speech/tts_controller_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/float_util.h" 10 #include "base/float_util.h"
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 } 430 }
431 431
432 return static_cast<int>(i); 432 return static_cast<int>(i);
433 } 433 }
434 } 434 }
435 435
436 return -1; 436 return -1;
437 } 437 }
438 438
439 void TtsControllerImpl::VoicesChanged() { 439 void TtsControllerImpl::VoicesChanged() {
440 // Existence of platform tts indicates explicit requests to tts. Since
441 // |VoicesChanged| can occur implicitly, only send if needed.
442 if (!platform_impl_)
443 return;
444
440 for (std::set<VoicesChangedDelegate*>::iterator iter = 445 for (std::set<VoicesChangedDelegate*>::iterator iter =
441 voices_changed_delegates_.begin(); 446 voices_changed_delegates_.begin();
442 iter != voices_changed_delegates_.end(); ++iter) { 447 iter != voices_changed_delegates_.end(); ++iter) {
443 (*iter)->OnVoicesChanged(); 448 (*iter)->OnVoicesChanged();
444 } 449 }
445 } 450 }
446 451
447 void TtsControllerImpl::AddVoicesChangedDelegate( 452 void TtsControllerImpl::AddVoicesChangedDelegate(
448 VoicesChangedDelegate* delegate) { 453 VoicesChangedDelegate* delegate) {
449 voices_changed_delegates_.insert(delegate); 454 voices_changed_delegates_.insert(delegate);
450 } 455 }
451 456
452 void TtsControllerImpl::RemoveVoicesChangedDelegate( 457 void TtsControllerImpl::RemoveVoicesChangedDelegate(
453 VoicesChangedDelegate* delegate) { 458 VoicesChangedDelegate* delegate) {
454 voices_changed_delegates_.erase(delegate); 459 voices_changed_delegates_.erase(delegate);
455 } 460 }
456 461
457 void TtsControllerImpl::SetTtsEngineDelegate( 462 void TtsControllerImpl::SetTtsEngineDelegate(
458 TtsEngineDelegate* delegate) { 463 TtsEngineDelegate* delegate) {
459 tts_engine_delegate_ = delegate; 464 tts_engine_delegate_ = delegate;
460 } 465 }
461 466
462 TtsEngineDelegate* TtsControllerImpl::GetTtsEngineDelegate() { 467 TtsEngineDelegate* TtsControllerImpl::GetTtsEngineDelegate() {
463 return tts_engine_delegate_; 468 return tts_engine_delegate_;
464 } 469 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698