content/browser/renderer_host/pepper/pepper_gamepad_host.h - Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/

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/browser/renderer_host/pepper/pepper_gamepad_host.h

Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Final tweaks Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/gamepad_browser_message_filter.h ('k') | content/browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/pepper/pepper_gamepad_host.h

diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.h b/content/browser/renderer_host/pepper/pepper_gamepad_host.h

index 963f7901340159bce126f8e0a0f2a3ca9fc974be..0da28d93f5c13d4d03f35d9e35296c1120ddf0ab 100644

--- a/content/browser/renderer_host/pepper/pepper_gamepad_host.h

+++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.h

@@ -10,8 +10,8 @@

#include "base/compiler_specific.h"

#include "base/macros.h"

#include "base/memory/weak_ptr.h"

-#include "content/browser/gamepad/gamepad_consumer.h"

#include "content/common/content_export.h"

+#include "device/gamepad/gamepad_consumer.h"

#include "ppapi/host/resource_host.h"

namespace ppapi {

@@ -27,7 +27,7 @@ class GamepadService;

class CONTENT_EXPORT PepperGamepadHost :

public ppapi::host::ResourceHost,

- public GamepadConsumer {

+ public device::GamepadConsumer {

public:

PepperGamepadHost(BrowserPpapiHost* host,

PP_Instance instance,