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

Unified Diff: content/browser/gamepad/gamepad_provider.cc

Issue 9110039: Revert 116724 - Add gamepad data fetcher for Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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/browser/gamepad/gamepad_provider.cc
===================================================================
--- content/browser/gamepad/gamepad_provider.cc (revision 116725)
+++ content/browser/gamepad/gamepad_provider.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,14 +12,41 @@
#include "base/task.h"
#include "base/threading/thread.h"
#include "base/threading/thread_restrictions.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/browser/gamepad/gamepad_provider.h"
#include "content/browser/gamepad/data_fetcher.h"
-#include "content/browser/gamepad/gamepad_provider.h"
-#include "content/browser/gamepad/platform_data_fetcher.h"
#include "content/common/gamepad_messages.h"
-#include "content/public/browser/browser_thread.h"
+#if defined(OS_WIN)
+#include "content/browser/gamepad/data_fetcher_win.h"
+#elif defined(OS_MACOSX)
+#include "content/browser/gamepad/data_fetcher_mac.h"
+#endif
+
namespace content {
+// Define the default data fetcher that GamepadProvider will use if none is
+// supplied. (GamepadPlatformDataFetcher).
+#if defined(OS_WIN)
+
+typedef GamepadDataFetcherWindows GamepadPlatformDataFetcher;
+
+#elif defined(OS_MACOSX)
+
+typedef GamepadDataFetcherMac GamepadPlatformDataFetcher;
+
+#else
+
+class GamepadEmptyDataFetcher : public GamepadDataFetcher {
+ public:
+ void GetGamepadData(WebKit::WebGamepads* pads, bool) {
+ pads->length = 0;
+ }
+};
+typedef GamepadEmptyDataFetcher GamepadPlatformDataFetcher;
+
+#endif
+
GamepadProvider::GamepadProvider(GamepadDataFetcher* fetcher)
: is_paused_(false),
devices_changed_(true),
@@ -35,8 +62,7 @@
memset(hwbuf, 0, sizeof(GamepadHardwareBuffer));
polling_thread_.reset(new base::Thread("Gamepad polling thread"));
- polling_thread_->StartWithOptions(
- base::Thread::Options(MessageLoop::TYPE_IO, 0));
+ polling_thread_->Start();
MessageLoop* polling_loop = polling_thread_->message_loop();
polling_loop->PostTask(
« no previous file with comments | « content/browser/gamepad/gamepad_provider.h ('k') | content/browser/gamepad/gamepad_standard_mappings_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698