Using ShellObserver instead of creating MaximizeModeController::Observer

ash/common/wm/maximize_mode/maximize_mode_controller.cc

 // 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.
 
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 
 #include <utility>
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
@@ skipping 115 matching lines @@
     WmShell::Get()->RemoveDisplayObserver(this);
 
 #if defined(OS_CHROMEOS)
   if (is_enabled)
     chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this);
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 #endif  // OS_CHROMEOS
 }
 
-void MaximizeModeController::AddObserver(Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void MaximizeModeController::RemoveObserver(Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 bool MaximizeModeController::CanEnterMaximizeMode() {
   // If we have ever seen accelerometer data, then HandleHingeRotation may
   // trigger maximize mode at some point in the future.
   // The --enable-touch-view-testing switch can also mean that we may enter
   // maximize mode.
   // TODO(mgiuca): This can result in false positives, as it returns true for
   // any device with an accelerometer. Have TouchView-enabled devices explicitly
   // set a flag, and change this implementation to simply return true iff the
   // flag is present (http://crbug.com/457445).
   return have_seen_accelerometer_data_ ||
@@ skipping 11 matching lines @@
 
   WmShell* shell = WmShell::Get();
 
   if (should_enable) {
     maximize_mode_window_manager_.reset(new MaximizeModeWindowManager());
     // TODO(jonross): Move the maximize mode notifications from ShellObserver
     // to MaximizeModeController::Observer
     shell->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_ENABLED);
     shell->OnMaximizeModeStarted();
 
-    touchview_observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
+    observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
       observer->OnTouchViewToggled(true);
     });
 
   } else {
     maximize_mode_window_manager_.reset();
     shell->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_DISABLED);
     shell->OnMaximizeModeEnded();
 
-    touchview_observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
+    observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
       observer->OnTouchViewToggled(false);
     });
   }
 }
 
 bool MaximizeModeController::IsMaximizeModeWindowManagerEnabled() const {
   return maximize_mode_window_manager_.get() != NULL;
 }
 
 void MaximizeModeController::AddWindow(WmWindow* window) {
@@ skipping 147 matching lines @@
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshEnableTouchViewTesting)) {
     // We don't let accelerometer updates interfere with the maximize mode
     // status as set by the touch-view-testing keyboard shortcut.
     return;
   }
 
   if (IsMaximizeModeWindowManagerEnabled())
     return;
   EnableMaximizeModeWindowManager(true);
-
-  for (auto& observer : observers_)
-    observer.OnEnterMaximizeMode();
 }
 
 void MaximizeModeController::LeaveMaximizeMode() {
   event_blocker_.reset();
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshEnableTouchViewTesting)) {
     // We don't let accelerometer updates interfere with the maximize mode
     // status as set by the touch-view-testing keyboard shortcut.
     return;
   }
 
   if (!IsMaximizeModeWindowManagerEnabled())
     return;
   EnableMaximizeModeWindowManager(false);
-
-  for (auto& observer : observers_)
-    observer.OnLeaveMaximizeMode();
 }
 
 // Called after maximize mode has started, windows might still animate though.
 void MaximizeModeController::OnMaximizeModeStarted() {
   RecordTouchViewUsageInterval(TOUCH_VIEW_INTERVAL_INACTIVE);
 }
 
 // Called after maximize mode has ended, windows might still be returning to
 // their original position.
 void MaximizeModeController::OnMaximizeModeEnded() {
@@ skipping 31 matching lines @@
 
 MaximizeModeController::TouchViewIntervalType
 MaximizeModeController::CurrentTouchViewIntervalType() {
   if (IsMaximizeModeWindowManagerEnabled())
     return TOUCH_VIEW_INTERVAL_ACTIVE;
   return TOUCH_VIEW_INTERVAL_INACTIVE;
 }
 
 void MaximizeModeController::AddObserver(mojom::TouchViewObserverPtr observer) {
   observer->OnTouchViewToggled(IsMaximizeModeWindowManagerEnabled());
-  touchview_observers_.AddPtr(std::move(observer));
+  observers_.AddPtr(std::move(observer));
 }
 
 void MaximizeModeController::OnAppTerminating() {
   // The system is about to shut down, so record TouchView usage interval
   // metrics based on whether TouchView mode is currently active.
   RecordTouchViewUsageInterval(CurrentTouchViewIntervalType());
 
   if (CanEnterMaximizeMode()) {
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchView.TouchViewActiveTotal",
                                 total_touchview_time_.InMinutes(), 1,
@@ skipping 21 matching lines @@
   return elapsed_time.InSeconds() <= kLidRecentlyOpenedDurationSeconds;
 }
 
 void MaximizeModeController::SetTickClockForTest(
     std::unique_ptr<base::TickClock> tick_clock) {
   DCHECK(tick_clock_);
   tick_clock_ = std::move(tick_clock);
 }
 
 }  // namespace ash