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_ |