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

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

Unified Diff: content/renderer/pepper/ppb_scrollbar_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, 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:

Index: content/renderer/pepper/ppb_scrollbar_impl.cc

===================================================================

--- content/renderer/pepper/ppb_scrollbar_impl.cc (revision 213482)

+++ content/renderer/pepper/ppb_scrollbar_impl.cc (working copy)

@@ -2,11 +2,17 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"

+#include "content/renderer/pepper/ppb_scrollbar_impl.h"

#include "base/bind.h"

#include "base/logging.h"

#include "base/message_loop/message_loop.h"

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

+#include "content/renderer/pepper/event_conversion.h"

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

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

+#include "content/renderer/pepper/ppb_image_data_impl.h"

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

#include "ppapi/c/dev/ppp_scrollbar_dev.h"

#include "ppapi/thunk/thunk.h"

#include "skia/ext/platform_canvas.h"

@@ -16,12 +22,6 @@

#include "third_party/WebKit/public/web/WebInputEvent.h"

#include "third_party/WebKit/public/web/WebPluginScrollbar.h"

#include "webkit/glue/webkit_glue.h"

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

-#include "webkit/plugins/ppapi/event_conversion.h"

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

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

-#include "webkit/plugins/ppapi/ppb_image_data_impl.h"

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

#if defined(OS_WIN)

#include "base/win/windows_version.h"