Using ShellObserver instead of creating MaximizeModeController::Observer

ash/common/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_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
 #define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/public/interfaces/touch_view.mojom.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/observer_list.h"
 #include "base/time/time.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/accelerometer/accelerometer_types.h"
 #include "chromeos/dbus/power_manager_client.h"
 #endif  // OS_CHROMEOS
@@ skipping 23 matching lines @@
 // angle and rotates the display to match the device when in maximize mode.
 class ASH_EXPORT MaximizeModeController :
 #if defined(OS_CHROMEOS)
     public chromeos::AccelerometerReader::Observer,
     public chromeos::PowerManagerClient::Observer,
 #endif  // OS_CHROMEOS
     NON_EXPORTED_BASE(public mojom::TouchViewManager),
     public ShellObserver,
     public WmDisplayObserver {
  public:
-  // Interface for observing changes from MaximizeModeController.
-  class Observer {
-   public:
-    virtual ~Observer() {}
-
-    // Called when device enters maximize mode.
-    virtual void OnEnterMaximizeMode() {}
-
-    // Called when device leaves maximize mode.
-    virtual void OnLeaveMaximizeMode() {}
-  };
-
   MaximizeModeController();
   ~MaximizeModeController() override;
 
-  // Adds and removes the |observer|.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
   // True if it is possible to enter maximize mode in the current
   // configuration. If this returns false, it should never be the case that
   // maximize mode becomes enabled.
   bool CanEnterMaximizeMode();
 
   // TODO(jonross): Merge this with EnterMaximizeMode. Currently these are
   // separate for several reasons: there is no internal display when running
   // unittests; the event blocker prevents keyboard input when running ChromeOS
   // on linux. http://crbug.com/362881
   // Turn the always maximize mode window manager on or off.
@@ skipping 114 matching lines @@
   // Tracks smoothed accelerometer data over time. This is done when the hinge
   // is approaching vertical to remove abrupt acceleration that can lead to
   // incorrect calculations of hinge angles.
   gfx::Vector3dF base_smoothed_;
   gfx::Vector3dF lid_smoothed_;
 
   // Bindings for the TouchViewManager interface.
   mojo::BindingSet<mojom::TouchViewManager> bindings_;
 
   // The set of touchview observers to be notified about mode changes.
-  mojo::InterfacePtrSet<mojom::TouchViewObserver> touchview_observers_;
-
-  base::ObserverList<Observer> observers_;
+  mojo::InterfacePtrSet<mojom::TouchViewObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_