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

Unified Diff: device/gamepad/gamepad_monitor.h

Issue 2563483006: Move gamepad_service out of content/ and into device/ (Closed)
Patch Set: addressed Blundell's review comments Created 4 years 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 | « device/gamepad/BUILD.gn ('k') | device/gamepad/gamepad_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/gamepad/gamepad_monitor.h
diff --git a/content/browser/renderer_host/gamepad_monitor.h b/device/gamepad/gamepad_monitor.h
similarity index 60%
rename from content/browser/renderer_host/gamepad_monitor.h
rename to device/gamepad/gamepad_monitor.h
index 1503a240268a334466cffec01728fc854ad867b8..fab371e3f470c9058e77dae6aaf61e5a5e03823b 100644
--- a/content/browser/renderer_host/gamepad_monitor.h
+++ b/device/gamepad/gamepad_monitor.h
@@ -2,23 +2,25 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_GAMEPAD_MONITOR_H_
-#define CONTENT_BROWSER_RENDERER_HOST_GAMEPAD_MONITOR_H_
+#ifndef DEVICE_GAMEPAD_GAMEPAD_MONITOR_H_
+#define DEVICE_GAMEPAD_GAMEPAD_MONITOR_H_
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "device/gamepad/gamepad_consumer.h"
+#include "device/gamepad/gamepad_export.h"
#include "device/gamepad/public/interfaces/gamepad.mojom.h"
-namespace content {
+namespace device {
-class GamepadMonitor : public device::GamepadConsumer,
- public device::mojom::GamepadMonitor {
+class DEVICE_GAMEPAD_EXPORT GamepadMonitor
+ : public GamepadConsumer,
+ NON_EXPORTED_BASE(public mojom::GamepadMonitor) {
public:
GamepadMonitor();
~GamepadMonitor() override;
- static void Create(device::mojom::GamepadMonitorRequest request);
+ static void Create(mojom::GamepadMonitorRequest request);
// GamepadConsumer implementation.
void OnGamepadConnected(unsigned index,
@@ -26,19 +28,19 @@ class GamepadMonitor : public device::GamepadConsumer,
void OnGamepadDisconnected(unsigned index,
const blink::WebGamepad& gamepad) override;
- // device::mojom::GamepadMonitor implementation.
+ // mojom::GamepadMonitor implementation.
void GamepadStartPolling(
const GamepadStartPollingCallback& callback) override;
void GamepadStopPolling(const GamepadStopPollingCallback& callback) override;
- void SetObserver(device::mojom::GamepadObserverPtr gamepad_observer) override;
+ void SetObserver(mojom::GamepadObserverPtr gamepad_observer) override;
private:
- device::mojom::GamepadObserverPtr gamepad_observer_;
+ mojom::GamepadObserverPtr gamepad_observer_;
bool is_started_;
DISALLOW_COPY_AND_ASSIGN(GamepadMonitor);
};
-} // namespace content
+} // namespace device
-#endif // CONTENT_BROWSER_RENDERER_HOST_GAMEPAD_MONITOR_H_
+#endif // DEVICE_GAMEPAD_GAMEPAD_MONITOR_H_
« no previous file with comments | « device/gamepad/BUILD.gn ('k') | device/gamepad/gamepad_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698