Cleanup: More random cleanup for gamepad code.

content/browser/gamepad/gamepad_provider.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_PROVIDER_H_
 #define CONTENT_BROWSER_GAMEPAD_GAMEPAD_PROVIDER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "base/shared_memory.h"
 #include "base/synchronization/lock.h"
 #include "base/system_monitor/system_monitor.h"
-#include "content/browser/gamepad/data_fetcher.h"
 #include "content/common/content_export.h"
-#include "content/common/gamepad_hardware_buffer.h"
 
 namespace base {
 class Thread;
 }
 
-struct GamepadMsg_Updated_Params;
-
 namespace content {
 
+class GamepadDataFetcher;
+struct GamepadHardwareBuffer;
+
 class CONTENT_EXPORT GamepadProvider :
-    public base::RefCountedThreadSafe<GamepadProvider>,
-    public base::SystemMonitor::DevicesChangedObserver {
+  public base::RefCountedThreadSafe<GamepadProvider>,
+  public base::SystemMonitor::DevicesChangedObserver {
  public:
   explicit GamepadProvider(GamepadDataFetcher* fetcher);
 
   base::SharedMemoryHandle GetRendererSharedMemoryHandle(
       base::ProcessHandle renderer_process);
 
   // Pause and resume the background polling thread. Can be called from any
   // thread.
   void Pause();
   void Resume();
 
+  // base::SystemMonitor::DevicesChangedObserver implementation.
+  virtual void OnDevicesChanged() OVERRIDE;
+
  private:
   friend class base::RefCountedThreadSafe<GamepadProvider>;
 
   virtual ~GamepadProvider();
 
   // Method for starting the polling, runs on polling_thread_.
   void DoInitializePollingThread();
 
   // Method for polling a GamepadDataFetcher. Runs on the polling_thread_.
   void DoPoll();
   void ScheduleDoPoll();
 
-  virtual void OnDevicesChanged() OVERRIDE;
-
   GamepadHardwareBuffer* SharedMemoryAsHardwareBuffer();
 
   enum { kDesiredSamplingIntervalMs = 16 };
 
   // Keeps track of when the background thread is paused. Access to is_paused_
   // must be guarded by is_paused_lock_.
   base::Lock is_paused_lock_;
   bool is_paused_;
 
   // Updated based on notification from SystemMonitor when the system devices
@@ skipping 18 matching lines @@
 
   static GamepadProvider* instance_;
   base::WeakPtrFactory<GamepadProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GamepadProvider);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GAMEPAD_GAMEPAD_PROVIDER_H_