| Index: content/browser/renderer_host/gamepad_browser_message_filter.cc
|
| diff --git a/content/browser/renderer_host/gamepad_browser_message_filter.cc b/content/browser/renderer_host/gamepad_browser_message_filter.cc
|
| index c03e478827e00d5142077d59eb6e84034c4d319a..6a8d3fbcecf6787148ea9863f9aeb942e94ed253 100644
|
| --- a/content/browser/renderer_host/gamepad_browser_message_filter.cc
|
| +++ b/content/browser/renderer_host/gamepad_browser_message_filter.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "content/browser/renderer_host/gamepad_browser_message_filter.h"
|
|
|
| -#include "content/browser/gamepad/gamepad_service.h"
|
| #include "content/common/gamepad_messages.h"
|
| +#include "device/gamepad/gamepad_service.h"
|
|
|
| namespace content {
|
|
|
| @@ -17,7 +17,7 @@ GamepadBrowserMessageFilter::GamepadBrowserMessageFilter()
|
| GamepadBrowserMessageFilter::~GamepadBrowserMessageFilter() {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| if (is_started_)
|
| - GamepadService::GetInstance()->RemoveConsumer(this);
|
| + device::GamepadService::GetInstance()->RemoveConsumer(this);
|
| }
|
|
|
| bool GamepadBrowserMessageFilter::OnMessageReceived(
|
| @@ -45,7 +45,7 @@ void GamepadBrowserMessageFilter::OnGamepadDisconnected(
|
|
|
| void GamepadBrowserMessageFilter::OnGamepadStartPolling(
|
| base::SharedMemoryHandle* renderer_handle) {
|
| - GamepadService* service = GamepadService::GetInstance();
|
| + device::GamepadService* service = device::GamepadService::GetInstance();
|
| DCHECK(!is_started_);
|
| if (is_started_)
|
| return;
|
| @@ -61,7 +61,7 @@ void GamepadBrowserMessageFilter::OnGamepadStopPolling() {
|
| return;
|
|
|
| is_started_ = false;
|
| - GamepadService::GetInstance()->ConsumerBecameInactive(this);
|
| + device::GamepadService::GetInstance()->ConsumerBecameInactive(this);
|
| }
|
|
|
| } // namespace content
|
|
|