mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Rename ScopedComPtr::get() to ScopedComPtr::Get()

Browse source 
https://codereview.chromium.org/2824773002
This commit is contained in:
Aleksei Kuzmin 2017-09-10 16:21:50 +02:00 • committed by Cheng Zhao
parent 1073c9b1ed
commit 485e43636b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/platform_util_win.cc
View file

@ -368,7 +368,7 @@ bool MoveItemToTrash(const base::FilePath& path) {
// Processes the queued command DeleteItem. This will trigger // Processes the queued command DeleteItem. This will trigger
// the DeleteFileProgressSink to check for Recycle Bin. // the DeleteFileProgressSink to check for Recycle Bin.
return SUCCEEDED(pfo->DeleteItem(delete_item.get(), delete_sink.get())) && return SUCCEEDED(pfo->DeleteItem(delete_item.Get(), delete_sink.Get())) &&
SUCCEEDED(pfo->PerformOperations()); SUCCEEDED(pfo->PerformOperations());
} }

12
chromium_src/chrome/browser/speech/tts_win.cc
View file

@ -76,7 +76,7 @@ bool TtsPlatformImplWin::Speak(
std::wstring prefix; std::wstring prefix;
std::wstring suffix; std::wstring suffix;
if (!speech_synthesizer_.get()) if (!speech_synthesizer_.Get())
return false; return false;
// TODO(dmazzoni): support languages other than the default: crbug.com/88059 // TODO(dmazzoni): support languages other than the default: crbug.com/88059
@ -121,7 +121,7 @@ bool TtsPlatformImplWin::Speak(
} }
bool TtsPlatformImplWin::StopSpeaking() { bool TtsPlatformImplWin::StopSpeaking() {
if (speech_synthesizer_.get()) { if (speech_synthesizer_.Get()) {
// Clear the stream number so that any further events relating to this // Clear the stream number so that any further events relating to this
// utterance are ignored. // utterance are ignored.
stream_number_ = 0; stream_number_ = 0;
@ -139,7 +139,7 @@ bool TtsPlatformImplWin::StopSpeaking() {
} }
void TtsPlatformImplWin::Pause() { void TtsPlatformImplWin::Pause() {
if (speech_synthesizer_.get() && utterance_id_ && !paused_) { if (speech_synthesizer_.Get() && utterance_id_ && !paused_) {
speech_synthesizer_->Pause(); speech_synthesizer_->Pause();
paused_ = true; paused_ = true;
TtsController::GetInstance()->OnTtsEvent( TtsController::GetInstance()->OnTtsEvent(
@ -148,7 +148,7 @@ void TtsPlatformImplWin::Pause() {
} }
void TtsPlatformImplWin::Resume() { void TtsPlatformImplWin::Resume() {
if (speech_synthesizer_.get() && utterance_id_ && paused_) { if (speech_synthesizer_.Get() && utterance_id_ && paused_) {
speech_synthesizer_->Resume(); speech_synthesizer_->Resume();
paused_ = false; paused_ = false;
TtsController::GetInstance()->OnTtsEvent( TtsController::GetInstance()->OnTtsEvent(
@ -157,7 +157,7 @@ void TtsPlatformImplWin::Resume() {
} }
bool TtsPlatformImplWin::IsSpeaking() { bool TtsPlatformImplWin::IsSpeaking() {
if (speech_synthesizer_.get()) { if (speech_synthesizer_.Get()) {
SPVOICESTATUS status; SPVOICESTATUS status;
HRESULT result = speech_synthesizer_->GetStatus(&status, NULL); HRESULT result = speech_synthesizer_->GetStatus(&status, NULL);
if (result == S_OK) { if (result == S_OK) {
@ -233,7 +233,7 @@ TtsPlatformImplWin::TtsPlatformImplWin()
char_position_(0), char_position_(0),
paused_(false) { paused_(false) {
speech_synthesizer_.CreateInstance(CLSID_SpVoice); speech_synthesizer_.CreateInstance(CLSID_SpVoice);
if (speech_synthesizer_.get()) { if (speech_synthesizer_.Get()) {
ULONGLONG event_mask = ULONGLONG event_mask =
SPFEI(SPEI_START_INPUT_STREAM) | SPFEI(SPEI_START_INPUT_STREAM) |
SPFEI(SPEI_TTS_BOOKMARK) | SPFEI(SPEI_TTS_BOOKMARK) |