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

Side by Side Diff: content/child/webkitplatformsupport_impl.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « content/child/webkitplatformsupport_impl.h ('k') | content/child/webmessageportchannel_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "content/child/child_thread.h" 6 #include "content/child/child_thread.h"
7 #include "content/child/socket_stream_dispatcher.h" 7 #include "content/child/socket_stream_dispatcher.h"
8 #include "content/child/webkitplatformsupport_impl.h" 8 #include "content/child/webkitplatformsupport_impl.h"
9 #include "content/child/websocket_bridge.h" 9 #include "content/child/websocket_bridge.h"
10 #include "content/public/common/content_client.h" 10 #include "content/public/common/content_client.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() { 14 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() {
15 } 15 }
16 16
17 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { 17 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
18 } 18 }
19 19
20 string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) { 20 base::string16 WebKitPlatformSupportImpl::GetLocalizedString(int message_id) {
21 return GetContentClient()->GetLocalizedString(message_id); 21 return GetContentClient()->GetLocalizedString(message_id);
22 } 22 }
23 23
24 base::StringPiece WebKitPlatformSupportImpl::GetDataResource( 24 base::StringPiece WebKitPlatformSupportImpl::GetDataResource(
25 int resource_id, 25 int resource_id,
26 ui::ScaleFactor scale_factor) { 26 ui::ScaleFactor scale_factor) {
27 return GetContentClient()->GetDataResource(resource_id, scale_factor); 27 return GetContentClient()->GetDataResource(resource_id, scale_factor);
28 } 28 }
29 29
30 webkit_glue::ResourceLoaderBridge* 30 webkit_glue::ResourceLoaderBridge*
31 WebKitPlatformSupportImpl::CreateResourceLoader( 31 WebKitPlatformSupportImpl::CreateResourceLoader(
32 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { 32 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
33 return ChildThread::current()->CreateBridge(request_info); 33 return ChildThread::current()->CreateBridge(request_info);
34 } 34 }
35 35
36 webkit_glue::WebSocketStreamHandleBridge* 36 webkit_glue::WebSocketStreamHandleBridge*
37 WebKitPlatformSupportImpl::CreateWebSocketStreamBridge( 37 WebKitPlatformSupportImpl::CreateWebSocketStreamBridge(
38 blink::WebSocketStreamHandle* handle, 38 blink::WebSocketStreamHandle* handle,
39 webkit_glue::WebSocketStreamHandleDelegate* delegate) { 39 webkit_glue::WebSocketStreamHandleDelegate* delegate) {
40 SocketStreamDispatcher* dispatcher = 40 SocketStreamDispatcher* dispatcher =
41 ChildThread::current()->socket_stream_dispatcher(); 41 ChildThread::current()->socket_stream_dispatcher();
42 return dispatcher->CreateBridge(handle, delegate); 42 return dispatcher->CreateBridge(handle, delegate);
43 } 43 }
44 44
45 blink::WebSocketHandle* WebKitPlatformSupportImpl::createWebSocketHandle() { 45 blink::WebSocketHandle* WebKitPlatformSupportImpl::createWebSocketHandle() {
46 return new WebSocketBridge; 46 return new WebSocketBridge;
47 } 47 }
48 48
49 } // namespace content 49 } // namespace content
OLDNEW
« no previous file with comments | « content/child/webkitplatformsupport_impl.h ('k') | content/child/webmessageportchannel_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698