Index: content/browser/gamepad/gamepad_service.cc |
diff --git a/content/browser/gamepad/gamepad_service.cc b/content/browser/gamepad/gamepad_service.cc |
index 11a6964b3ab5cf9953569d5aa0b6b8c53be6b51f..f778a119029fe00a90c67239bf1f9d2586caf5d7 100644 |
--- a/content/browser/gamepad/gamepad_service.cc |
+++ b/content/browser/gamepad/gamepad_service.cc |
@@ -1,4 +1,5 @@ |
// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -13,11 +14,19 @@ |
namespace content { |
-GamepadService::GamepadService() : num_readers_(0) { |
+GamepadService::GamepadService() |
+ : num_readers_(0) |
+#if defined(OS_ANDROID) |
+ , gamepad_access_timestamp_(base::Time::NowFromSystemTime()) |
+#endif |
+ { |
} |
GamepadService::GamepadService(scoped_ptr<GamepadDataFetcher> fetcher) |
: num_readers_(0), |
+#if defined(OS_ANDROID) |
+ gamepad_access_timestamp_(base::Time::NowFromSystemTime()), |
+#endif |
provider_(new GamepadProvider(fetcher.Pass())) { |
thread_checker_.DetachFromThread(); |
} |
@@ -56,6 +65,33 @@ void GamepadService::RegisterForUserGesture(const base::Closure& closure) { |
provider_->RegisterForUserGesture(closure); |
} |
+#if defined(OS_ANDROID) |
+void GamepadService::SetGamepadAccessTimestamp( |
+ base::Time gamepad_access_timestamp) { |
+ gamepad_access_timestamp_ = gamepad_access_timestamp; |
+} |
+ |
+base::Time GamepadService::GetGamepadAccessTimestamp() { |
+ return gamepad_access_timestamp_; |
+} |
+ |
+bool GamepadService::GetPollState() { |
+ if (provider_) |
+ return provider_->GetPollState(); |
+ return false; |
+} |
+ |
+void GamepadService::Pause() { |
+ if (provider_) |
+ provider_->Pause(); |
+} |
+ |
+void GamepadService::Resume() { |
+ if (provider_) |
+ provider_->Resume(); |
+} |
+#endif |
+ |
void GamepadService::Terminate() { |
provider_.reset(); |
} |