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

Side by Side Diff: content/child/socket_stream_dispatcher.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, 12 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/child/socket_stream_dispatcher.h" 5 #include "content/child/socket_stream_dispatcher.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/id_map.h" 10 #include "base/id_map.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 delegate_->DidClose(handle_); 161 delegate_->DidClose(handle_);
162 delegate_ = NULL; 162 delegate_ = NULL;
163 Release(); 163 Release();
164 } 164 }
165 165
166 void IPCWebSocketStreamHandleBridge::OnFailed(int error_code, 166 void IPCWebSocketStreamHandleBridge::OnFailed(int error_code,
167 const char* error_msg) { 167 const char* error_msg) {
168 DVLOG(1) << "Bridge #" << socket_id_ << " OnFailed (error_code=" << error_code 168 DVLOG(1) << "Bridge #" << socket_id_ << " OnFailed (error_code=" << error_code
169 << ")"; 169 << ")";
170 if (delegate_) 170 if (delegate_)
171 delegate_->DidFail(handle_, error_code, ASCIIToUTF16(error_msg)); 171 delegate_->DidFail(handle_, error_code, base::ASCIIToUTF16(error_msg));
172 } 172 }
173 173
174 SocketStreamDispatcher::SocketStreamDispatcher() { 174 SocketStreamDispatcher::SocketStreamDispatcher() {
175 } 175 }
176 176
177 /* static */ 177 /* static */
178 webkit_glue::WebSocketStreamHandleBridge* 178 webkit_glue::WebSocketStreamHandleBridge*
179 SocketStreamDispatcher::CreateBridge( 179 SocketStreamDispatcher::CreateBridge(
180 blink::WebSocketStreamHandle* handle, 180 blink::WebSocketStreamHandle* handle,
181 webkit_glue::WebSocketStreamHandleDelegate* delegate) { 181 webkit_glue::WebSocketStreamHandleDelegate* delegate) {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 void SocketStreamDispatcher::OnFailed(int socket_id, int error_code) { 247 void SocketStreamDispatcher::OnFailed(int socket_id, int error_code) {
248 IPCWebSocketStreamHandleBridge* bridge = 248 IPCWebSocketStreamHandleBridge* bridge =
249 IPCWebSocketStreamHandleBridge::FromSocketId(socket_id); 249 IPCWebSocketStreamHandleBridge::FromSocketId(socket_id);
250 if (bridge) 250 if (bridge)
251 bridge->OnFailed(error_code, net::ErrorToString(error_code)); 251 bridge->OnFailed(error_code, net::ErrorToString(error_code));
252 else 252 else
253 DLOG(ERROR) << "No bridge for socket_id=" << socket_id; 253 DLOG(ERROR) << "No bridge for socket_id=" << socket_id;
254 } 254 }
255 255
256 } // namespace content 256 } // namespace content
OLDNEW
« no previous file with comments | « content/child/npapi/webplugin_delegate_impl_mac.mm ('k') | content/common/android/address_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698