Merge 261317 "Read and expose accelerometer values from cros-ec-..."

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 56 matching lines @@
 class CompoundEventFilter;
 class InputMethodEventFilter;
 class ShadowController;
 class VisibilityController;
 class WindowModalityController;
 }
 
 namespace ash {
 
 class AcceleratorController;
+class AccelerometerController;
 class AccessibilityDelegate;
 class AshNativeCursorManager;
 class AutoclickController;
 class DesktopBackgroundController;
 class DisplayController;
 class FirstRunHelper;
 class GPUSupport;
 class HighContrastController;
 class LockStateController;
 class MagnificationController;
@@ skipping 406 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();
+  }
+
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
   // TODO(oshima): Move these objects to DisplayController.
   ui::OutputConfigurator* output_configurator() {
     return output_configurator_.get();
   }
   internal::OutputConfiguratorAnimation* output_configurator_animation() {
     return output_configurator_animation_.get();
   }
   internal::DisplayErrorObserver* display_error_observer() {
@@ skipping 179 matching lines @@
   scoped_ptr<internal::DisplayManager> display_manager_;
   scoped_ptr<base::WeakPtrFactory<internal::DisplayManager> >
       weak_display_manager_factory_;
 
   scoped_ptr<internal::LocaleNotificationController>
       locale_notification_controller_;
 
   // The maximized window manager (if enabled).
   scoped_ptr<internal::MaximizeModeWindowManager> maximize_mode_window_manager_;
 
+  scoped_ptr<AccelerometerController> accelerometer_controller_;
+
 #if defined(OS_CHROMEOS)
   scoped_ptr<internal::PowerEventObserver> power_event_observer_;
   scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_;
   scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_;
   scoped_ptr<StickyKeysController> sticky_keys_controller_;
   scoped_ptr<internal::ResolutionNotificationController>
       resolution_notification_controller_;
   scoped_ptr<internal::BluetoothNotificationController>
       bluetooth_notification_controller_;
   scoped_ptr<internal::LogoutConfirmationController>
@@ skipping 30 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_