content/renderer/pepper/ppb_broker_impl.cc - Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper.

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/ppb_broker_impl.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: more more clang fun Created 7 years, 4 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

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 "webkit/plugins/ppapi/ppb_broker_impl.h"	5 #include "content/renderer/pepper/ppb_broker_impl.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

	8 #include "content/renderer/pepper/common.h"

	9 #include "content/renderer/pepper/plugin_module.h"

	10 #include "content/renderer/pepper/ppapi_plugin_instance_impl.h"

	11 #include "content/renderer/pepper/resource_helper.h"

8 #include "ppapi/shared_impl/platform_file.h"	12 #include "ppapi/shared_impl/platform_file.h"

9 #include "third_party/WebKit/public/web/WebDocument.h"	13 #include "third_party/WebKit/public/web/WebDocument.h"

10 #include "third_party/WebKit/public/web/WebElement.h"	14 #include "third_party/WebKit/public/web/WebElement.h"

11 #include "third_party/WebKit/public/web/WebPluginContainer.h"	15 #include "third_party/WebKit/public/web/WebPluginContainer.h"

12 #include "webkit/plugins/ppapi/common.h"

13 #include "webkit/plugins/ppapi/plugin_module.h"

14 #include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"

15 #include "webkit/plugins/ppapi/resource_helper.h"

16	16

17 using ppapi::PlatformFileToInt;	17 using ppapi::PlatformFileToInt;

18 using ppapi::thunk::PPB_Broker_API;	18 using ppapi::thunk::PPB_Broker_API;

19 using ppapi::TrackedCallback;	19 using ppapi::TrackedCallback;

20	20

21 namespace webkit {	21 namespace webkit {

22 namespace ppapi {	22 namespace ppapi {

23	23

24 // PPB_Broker_Impl ------------------------------------------------------	24 // PPB_Broker_Impl ------------------------------------------------------

25	25

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 pipe_handle_ = handle;	94 pipe_handle_ = handle;

95	95

96 // Synchronous calls are not supported.	96 // Synchronous calls are not supported.

97 DCHECK(TrackedCallback::IsPending(connect_callback_));	97 DCHECK(TrackedCallback::IsPending(connect_callback_));

98	98

99 connect_callback_->Run(result);	99 connect_callback_->Run(result);

100 }	100 }

101	101

102 } // namespace ppapi	102 } // namespace ppapi

103 } // namespace webkit	103 } // namespace webkit

OLD	NEW

« no previous file with comments | « content/renderer/pepper/ppb_broker_impl.h ('k') | content/renderer/pepper/ppb_buffer_impl.h » ('j') | no next file with comments »