Refactor AccelerometerReader to provide an Observer

ash/wm/maximize_mode/maximize_mode_controller.h

 // Copyright 2014 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_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
 #define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
 
-#include "ash/accelerometer/accelerometer_observer.h"
 #include "ash/ash_export.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell_observer.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/gfx/display.h"
 
 #if defined(OS_CHROMEOS)
+#include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/dbus/power_manager_client.h"
 #endif  // OS_CHROMEOS
 
 namespace base {
 class TickClock;
 }
 
 namespace ui {
 class EventHandler;
 }
 
 namespace ash {
 
 class MaximizeModeControllerTest;
 class ScopedDisableInternalMouseAndKeyboard;
 class MaximizeModeWindowManager;
 class MaximizeModeWindowManagerTest;
 namespace test {
 class MultiUserWindowManagerChromeOSTest;
 }
 
 // MaximizeModeController listens to accelerometer events and automatically
 // enters and exits maximize mode when the lid is opened beyond the triggering
 // angle and rotates the display to match the device when in maximize mode.
 class ASH_EXPORT MaximizeModeController
-    : public AccelerometerObserver,
+    : public ShellObserver,
 #if defined(OS_CHROMEOS)
+      public chromeos::AccelerometerReader::Observer,
       public chromeos::PowerManagerClient::Observer,
 #endif  // OS_CHROMEOS
-      public ShellObserver,
       public DisplayController::Observer {
  public:
   // Observer that reports changes to the state of MaximizeModeController's
   // rotation lock.
   class Observer {
    public:
     // Invoked whenever |rotation_locked_| is changed.
     virtual void OnRotationLockChanged(bool rotation_locked) {}
 
    protected:
@@ skipping 47 matching lines @@
   // If the maximize mode is not enabled no action will be performed.
   void AddWindow(aura::Window* window);
 
   // TODO(jonross): move this into the destructor. Currently separated as
   // ShellOberver notifies of maximize mode ending, and the observers end up
   // attempting to access MaximizeModeController via the Shell. If done in
   // destructor the controller is null, and the observers segfault.
   // Shuts down down the MaximizeModeWindowManager and notifies all observers.
   void Shutdown();
 
-  // AccelerometerObserver:
-  void OnAccelerometerUpdated(const ui::AccelerometerUpdate& update) override;
-
   // ShellObserver:
   void OnAppTerminating() override;
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
   // DisplayController::Observer:
   void OnDisplayConfigurationChanged() override;
 
 #if defined(OS_CHROMEOS)
+  // AccelerometerReader::Observer:

[flackr, 2014/12/12 16:47:10]

chromeos::AccelerometerReader::Observer:

[jonross, 2014/12/12 19:03:25]

Done.

+  void OnAccelerometerUpdated(const ui::AccelerometerUpdate& update) override;
+
   // PowerManagerClient::Observer:
-  virtual void LidEventReceived(bool open,
-                                const base::TimeTicks& time) override;
-  virtual void SuspendImminent() override;
-  virtual void SuspendDone(const base::TimeDelta& sleep_duration) override;
+  void LidEventReceived(bool open, const base::TimeTicks& time) override;
+  void SuspendImminent() override;
+  void SuspendDone(const base::TimeDelta& sleep_duration) override;
 #endif  // OS_CHROMEOS
 
  private:
   friend class MaximizeModeControllerTest;
   friend class MaximizeModeWindowManagerTest;
   friend class test::MultiUserWindowManagerChromeOSTest;
 
   // Set the TickClock. This is only to be used by tests that need to
   // artificially and deterministically control the current time.
   void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);
@@ skipping 81 matching lines @@
 
   // Tracks when the lid is closed. Used to prevent entering maximize mode.
   bool lid_is_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_