Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1577)

Unified Diff: content/browser/renderer_host/gamepad_browser_message_filter.cc

Issue 2466073002: Movw GamepadService out of content/browser/ and into device/ (Closed)
Patch Set: Fixed everything but one unittest Created 4 years, 1 month 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
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
« no previous file with comments | « content/browser/gamepad/gamepad_shared_buffer_impl.cc ('k') | content/browser/renderer_host/pepper/pepper_gamepad_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698