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

Side by Side Diff: content/renderer/media/rtc_dtmf_sender_handler.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
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/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 13 matching lines...) Expand all
24 DVLOG(1) << "::dtor"; 24 DVLOG(1) << "::dtor";
25 dtmf_sender_->UnregisterObserver(); 25 dtmf_sender_->UnregisterObserver();
26 } 26 }
27 27
28 void RtcDtmfSenderHandler::setClient( 28 void RtcDtmfSenderHandler::setClient(
29 blink::WebRTCDTMFSenderHandlerClient* client) { 29 blink::WebRTCDTMFSenderHandlerClient* client) {
30 webkit_client_ = client; 30 webkit_client_ = client;
31 } 31 }
32 32
33 blink::WebString RtcDtmfSenderHandler::currentToneBuffer() { 33 blink::WebString RtcDtmfSenderHandler::currentToneBuffer() {
34 return UTF8ToUTF16(dtmf_sender_->tones()); 34 return base::UTF8ToUTF16(dtmf_sender_->tones());
35 } 35 }
36 36
37 bool RtcDtmfSenderHandler::canInsertDTMF() { 37 bool RtcDtmfSenderHandler::canInsertDTMF() {
38 return dtmf_sender_->CanInsertDtmf(); 38 return dtmf_sender_->CanInsertDtmf();
39 } 39 }
40 40
41 bool RtcDtmfSenderHandler::insertDTMF(const blink::WebString& tones, 41 bool RtcDtmfSenderHandler::insertDTMF(const blink::WebString& tones,
42 long duration, 42 long duration,
43 long interToneGap) { 43 long interToneGap) {
44 std::string utf8_tones = UTF16ToUTF8(tones); 44 std::string utf8_tones = base::UTF16ToUTF8(tones);
45 return dtmf_sender_->InsertDtmf(utf8_tones, static_cast<int>(duration), 45 return dtmf_sender_->InsertDtmf(utf8_tones, static_cast<int>(duration),
46 static_cast<int>(interToneGap)); 46 static_cast<int>(interToneGap));
47 } 47 }
48 48
49 void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) { 49 void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) {
50 if (!webkit_client_) { 50 if (!webkit_client_) {
51 LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set."; 51 LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set.";
52 return; 52 return;
53 } 53 }
54 webkit_client_->didPlayTone(UTF8ToUTF16(tone)); 54 webkit_client_->didPlayTone(base::UTF8ToUTF16(tone));
55 } 55 }
56 56
57 } // namespace content 57 } // namespace content
58 58
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_data_channel_handler.cc ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698