content/renderer/pepper/pepper_websocket_host.cc - Issue 1230313005: split port_util.h off of net_util.h

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/pepper/pepper_websocket_host.cc

Issue 1230313005: split port_util.h off of net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove garbage that got added Created 5 years, 5 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

« no previous file with comments | « content/child/blink_platform_impl.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

OLD	NEW
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/renderer/pepper/pepper_websocket_host.h"	5 #include "content/renderer/pepper/pepper_websocket_host.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "content/public/renderer/renderer_ppapi_host.h"	9 #include "content/public/renderer/renderer_ppapi_host.h"

10 #include "net/base/net_util.h"	10 #include "net/base/port_util.h"

11 #include "ppapi/c/pp_errors.h"	11 #include "ppapi/c/pp_errors.h"

12 #include "ppapi/c/ppb_websocket.h"	12 #include "ppapi/c/ppb_websocket.h"

13 #include "ppapi/host/dispatch_host_message.h"	13 #include "ppapi/host/dispatch_host_message.h"

14 #include "ppapi/host/host_message_context.h"	14 #include "ppapi/host/host_message_context.h"

15 #include "ppapi/host/ppapi_host.h"	15 #include "ppapi/host/ppapi_host.h"

16 #include "ppapi/proxy/ppapi_messages.h"	16 #include "ppapi/proxy/ppapi_messages.h"

17 #include "third_party/WebKit/public/platform/WebString.h"	17 #include "third_party/WebKit/public/platform/WebString.h"

18 #include "third_party/WebKit/public/platform/WebURL.h"	18 #include "third_party/WebKit/public/platform/WebURL.h"

19 #include "third_party/WebKit/public/web/WebArrayBuffer.h"	19 #include "third_party/WebKit/public/web/WebArrayBuffer.h"

20 #include "third_party/WebKit/public/web/WebDocument.h"	20 #include "third_party/WebKit/public/web/WebDocument.h"

(...skipping 298 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
319	319

320 int32_t PepperWebSocketHost::OnHostMsgFail(	320 int32_t PepperWebSocketHost::OnHostMsgFail(

321 ppapi::host::HostMessageContext* context,	321 ppapi::host::HostMessageContext* context,

322 const std::string& message) {	322 const std::string& message) {

323 if (websocket_)	323 if (websocket_)

324 websocket_->fail(WebString::fromUTF8(message));	324 websocket_->fail(WebString::fromUTF8(message));

325 return PP_OK;	325 return PP_OK;

326 }	326 }

327	327

328 } // namespace content	328 } // namespace content

OLD	NEW