Refactor AccelerometerReader to provide an Observer

ash/shell.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 ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 24 matching lines @@
 namespace aura {
 class EventFilter;
 class RootWindow;
 class Window;
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
 }
 
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class AccelerometerReader;
+}
+#endif
+
 namespace gfx {
 class ImageSkia;
 class Point;
 class Rect;
 }
 
 namespace ui {
 class DisplayConfigurator;
 class Layer;
 class UserActivityPowerManagerNotifier;
@@ skipping 13 matching lines @@
 class NestedAcceleratorController;
 class ShadowController;
 class VisibilityController;
 class UserActivityDetector;
 class WindowModalityController;
 }
 
 namespace ash {
 
 class AcceleratorController;
-class AccelerometerController;
 class AccessibilityDelegate;
 class AppListController;
 class AshNativeCursorManager;
 class AutoclickController;
 class BluetoothNotificationController;
 class CaptureController;
 class DesktopBackgroundController;
 class DisplayChangeObserver;
 class DisplayConfiguratorAnimation;
 class DisplayController;
@@ skipping 412 matching lines @@
   }
 
   // Made available for tests.
   ::wm::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
   // Starts the animation that occurs on first login.
   void DoInitialWorkspaceAnimation();
 
-  AccelerometerController* accelerometer_controller() {
-    return accelerometer_controller_.get();
-  }
-
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
 
 #if defined(OS_CHROMEOS)
+  chromeos::AccelerometerReader* accelerometer_reader() {
+    return accelerometer_reader_.get();
+  }
+
   // TODO(oshima): Move these objects to DisplayController.
   ui::DisplayConfigurator* display_configurator() {
     return display_configurator_.get();
   }
   DisplayConfiguratorAnimation* display_configurator_animation() {
     return display_configurator_animation_.get();
   }
   DisplayErrorObserver* display_error_observer() {
     return display_error_observer_.get();
   }
@@ skipping 172 matching lines @@
   // An event filter that pre-handles global accelerators.
   scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
 
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
 
   scoped_ptr<DisplayManager> display_manager_;
 
   scoped_ptr<LocaleNotificationController> locale_notification_controller_;
 
-  scoped_ptr<AccelerometerController> accelerometer_controller_;
-
 #if defined(OS_CHROMEOS)
+  scoped_ptr<chromeos::AccelerometerReader> accelerometer_reader_;
   scoped_ptr<PowerEventObserver> power_event_observer_;
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
   scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
   scoped_ptr<StickyKeysController> sticky_keys_controller_;
   scoped_ptr<ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<LogoutConfirmationController> logout_confirmation_controller_;
   scoped_ptr<LastWindowClosedLogoutReminder>
@@ skipping 42 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_