| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "content/renderer/media/rtc_dtmf_sender_handler.h" | 5 #include "content/renderer/media/rtc_dtmf_sender_handler.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 RtcDtmfSenderHandler::RtcDtmfSenderHandler(DtmfSenderInterface* dtmf_sender) | 50 RtcDtmfSenderHandler::RtcDtmfSenderHandler(DtmfSenderInterface* dtmf_sender) |
| 51 : dtmf_sender_(dtmf_sender), | 51 : dtmf_sender_(dtmf_sender), |
| 52 webkit_client_(NULL), | 52 webkit_client_(NULL), |
| 53 weak_factory_(this) { | 53 weak_factory_(this) { |
| 54 DVLOG(1) << "::ctor"; | 54 DVLOG(1) << "::ctor"; |
| 55 observer_ = new Observer(weak_factory_.GetWeakPtr()); | 55 observer_ = new Observer(weak_factory_.GetWeakPtr()); |
| 56 dtmf_sender_->RegisterObserver(observer_.get()); | 56 dtmf_sender_->RegisterObserver(observer_.get()); |
| 57 } | 57 } |
| 58 | 58 |
| 59 RtcDtmfSenderHandler::~RtcDtmfSenderHandler() { | 59 RtcDtmfSenderHandler::~RtcDtmfSenderHandler() { |
| 60 DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); |
| 60 DVLOG(1) << "::dtor"; | 61 DVLOG(1) << "::dtor"; |
| 61 dtmf_sender_->UnregisterObserver(); | 62 dtmf_sender_->UnregisterObserver(); |
| 62 // Release |observer| before |weak_factory_| is destroyed. | 63 // Release |observer| before |weak_factory_| is destroyed. |
| 63 observer_ = NULL; | 64 observer_ = NULL; |
| 64 } | 65 } |
| 65 | 66 |
| 66 void RtcDtmfSenderHandler::SetClient( | 67 void RtcDtmfSenderHandler::SetClient( |
| 67 blink::WebRTCDTMFSenderHandlerClient* client) { | 68 blink::WebRTCDTMFSenderHandlerClient* client) { |
| 68 webkit_client_ = client; | 69 webkit_client_ = client; |
| 69 } | 70 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 86 | 87 |
| 87 void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) { | 88 void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) { |
| 88 if (!webkit_client_) { | 89 if (!webkit_client_) { |
| 89 LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set."; | 90 LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set."; |
| 90 return; | 91 return; |
| 91 } | 92 } |
| 92 webkit_client_->DidPlayTone(blink::WebString::FromUTF8(tone)); | 93 webkit_client_->DidPlayTone(blink::WebString::FromUTF8(tone)); |
| 93 } | 94 } |
| 94 | 95 |
| 95 } // namespace content | 96 } // namespace content |
| OLD | NEW |