| Index: content/browser/gamepad/gamepad_service.h
|
| diff --git a/content/browser/gamepad/gamepad_service.h b/content/browser/gamepad/gamepad_service.h
|
| index 22bea8c02a850cd230f5ca2a07b68925dbf899c6..c1c9e5df283faa14e0110012f97c273198ea2f3f 100644
|
| --- a/content/browser/gamepad/gamepad_service.h
|
| +++ b/content/browser/gamepad/gamepad_service.h
|
| @@ -79,6 +79,8 @@ class CONTENT_EXPORT GamepadService {
|
| // Called on IO thread when a gamepad is disconnected.
|
| void OnGamepadDisconnected(int index, const blink::WebGamepad& pad);
|
|
|
| + GamepadProvider* provider() { return provider_.get(); }
|
| +
|
| private:
|
| friend struct base::DefaultSingletonTraits<GamepadService>;
|
| friend class GamepadServiceTestConstructor;
|
| @@ -88,11 +90,11 @@ class CONTENT_EXPORT GamepadService {
|
|
|
| // Constructor for testing. This specifies the data fetcher to use for a
|
| // provider, bypassing the default platform one.
|
| - GamepadService(scoped_ptr<GamepadDataFetcher> fetcher);
|
| + explicit GamepadService(scoped_ptr<GamepadDataFetcher> fetcher);
|
|
|
| virtual ~GamepadService();
|
|
|
| - static void SetInstance(GamepadService*);
|
| + static void SetInstance(GamepadService* instance);
|
|
|
| void OnUserGesture();
|
|
|
|
|