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

Unified Diff: content/shell/renderer/test_runner/gamepad_controller.h

Issue 1133753003: Split gamepad provider from test runner controller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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/shell/renderer/test_runner/gamepad_controller.h
diff --git a/content/shell/renderer/test_runner/gamepad_controller.h b/content/shell/renderer/test_runner/gamepad_controller.h
index bd3edbb9f9ab1cccdaf1b1ef2f37b507ac07f446..ac4fbea05da1eeb13a64ca726ed35c4f55653ce1 100644
--- a/content/shell/renderer/test_runner/gamepad_controller.h
+++ b/content/shell/renderer/test_runner/gamepad_controller.h
@@ -8,7 +8,6 @@
#include <map>
#include "base/memory/weak_ptr.h"
-#include "content/public/renderer/renderer_gamepad_provider.h"
#include "third_party/WebKit/public/platform/WebGamepads.h"
namespace blink {
@@ -20,21 +19,16 @@ namespace content {
class WebTestDelegate;
-class GamepadController
- : public base::SupportsWeakPtr<GamepadController>,
- public RendererGamepadProvider {
+class GamepadController : public base::SupportsWeakPtr<GamepadController> {
public:
static base::WeakPtr<GamepadController> Create(WebTestDelegate* delegate);
- ~GamepadController() override;
+ ~GamepadController();
void Reset();
void Install(blink::WebFrame* frame);
- // RendererGamepadProvider implementation.
- void SampleGamepads(blink::WebGamepads& gamepads) override;
- bool OnControlMessageReceived(const IPC::Message& msg) override;
- void SendStartMessage() override;
- void SendStopMessage() override;
+ void SampleGamepads(blink::WebGamepads& gamepads);
+ void SetListener(blink::WebGamepadListener* listener);
private:
friend class GamepadControllerBindings;
@@ -56,6 +50,8 @@ class GamepadController
void SetAxisCount(int index, int axes);
void SetAxisData(int index, int axis, double data);
+ blink::WebGamepadListener* listener_;
+
blink::WebGamepads gamepads_;
// Mapping from gamepad index to connection state.
« no previous file with comments | « content/shell/renderer/layout_test/blink_test_runner.cc ('k') | content/shell/renderer/test_runner/gamepad_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698