| Index: content/browser/renderer_host/pepper/pepper_gamepad_host.cc
|
| diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.cc b/content/browser/renderer_host/pepper/pepper_gamepad_host.cc
|
| index e7a0aa79516b7cc8730a673a617cfd4f5a81c61a..775b7bcdbb402e538a33a57ac6835ea75807fb71 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_gamepad_host.cc
|
| +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.cc
|
| @@ -5,8 +5,8 @@
|
| #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
|
|
|
| #include "base/bind.h"
|
| -#include "content/browser/gamepad/gamepad_service.h"
|
| #include "content/public/browser/browser_ppapi_host.h"
|
| +#include "device/gamepad/gamepad_service.h"
|
| #include "ppapi/c/pp_errors.h"
|
| #include "ppapi/host/dispatch_host_message.h"
|
| #include "ppapi/host/host_message_context.h"
|
| @@ -21,11 +21,11 @@ PepperGamepadHost::PepperGamepadHost(BrowserPpapiHost* host,
|
| PP_Resource resource)
|
| : ResourceHost(host->GetPpapiHost(), instance, resource),
|
| browser_ppapi_host_(host),
|
| - gamepad_service_(GamepadService::GetInstance()),
|
| + gamepad_service_(device::GamepadService::GetInstance()),
|
| is_started_(false),
|
| weak_factory_(this) {}
|
|
|
| -PepperGamepadHost::PepperGamepadHost(GamepadService* gamepad_service,
|
| +PepperGamepadHost::PepperGamepadHost(device::GamepadService* gamepad_service,
|
| BrowserPpapiHost* host,
|
| PP_Instance instance,
|
| PP_Resource resource)
|
|
|