Moves maintaining ShellObservers back to Shell

ash/common/wm_shell.h

 // Copyright 2016 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_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 58 matching lines @@
 class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionController;
 class SessionStateDelegate;
 class ShelfController;
 class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
 struct ShellInitParams;
-class ShellObserver;
 class ShutdownController;
 class SystemTrayDelegate;
 class SystemTrayController;
 class SystemTrayNotifier;
 class ToastManager;
 class VpnList;
 class WallpaperController;
 class WallpaperDelegate;
 class WindowCycleController;
 class WindowCycleEventFilter;
@@ skipping 254 matching lines @@
   CreateImmersiveFullscreenController() = 0;
 
   virtual std::unique_ptr<KeyEventWatcher> CreateKeyEventWatcher() = 0;
 
   // Creates the ShelfView for each display and populates it with items.
   // Called after the user session is active and profile is available.
   void CreateShelfView();
 
   void CreateShelfDelegate();
 
-  // Called after maximize mode has started, windows might still animate though.
-  void OnMaximizeModeStarted();
-
-  // Called after maximize mode is about to end.
-  void OnMaximizeModeEnding();
-
-  // Called after maximize mode has ended, windows might still be returning to
-  // their original position.
-  void OnMaximizeModeEnded();
-
-  // Called when the overview mode is about to be started (before the windows
-  // get re-arranged).
-  virtual void OnOverviewModeStarting() = 0;
-
-  // Called after overview mode has ended.
-  virtual void OnOverviewModeEnded() = 0;
-
   // Called when the login status changes.
   // TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
   void UpdateAfterLoginStatusChange(LoginStatus status);
 
-  // Notify observers that fullscreen mode has changed for |root_window|.
-  void NotifyFullscreenStateChanged(bool is_fullscreen, WmWindow* root_window);
-
-  // Notify observers that |pinned_window| changed its pinned window state.
-  void NotifyPinnedStateChanged(WmWindow* pinned_window);
-
-  // Notify observers that the virtual keyboard has been activated/deactivated.
-  void NotifyVirtualKeyboardActivated(bool activated);
-
-  // Notify observers that the shelf was created for |root_window|.
-  // TODO(jamescook): Move to Shelf.
-  void NotifyShelfCreatedForRootWindow(WmWindow* root_window);
-
-  // Notify observers that |root_window|'s shelf changed auto-hide alignment.
-  // TODO(jamescook): Move to Shelf.
-  void NotifyShelfAlignmentChanged(WmWindow* root_window);
-
-  // Notify observers that |root_window|'s shelf changed auto-hide behavior.
-  // TODO(jamescook): Move to Shelf.
-  void NotifyShelfAutoHideBehaviorChanged(WmWindow* root_window);
-
   virtual SessionStateDelegate* GetSessionStateDelegate() = 0;
 
   virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
   virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
 
-  void AddShellObserver(ShellObserver* observer);
-  void RemoveShellObserver(ShellObserver* observer);
-
   // If |events| is PointerWatcherEventTypes::MOVES,
   // PointerWatcher::OnPointerEventObserved() is called for pointer move events.
   // If |events| is PointerWatcherEventTypes::DRAGS,
   // PointerWatcher::OnPointerEventObserved() is called for pointer drag events.
   // Requesting pointer moves or drags may incur a performance hit and should be
   // avoided if possible.
   virtual void AddPointerWatcher(views::PointerWatcher* watcher,
                                  views::PointerWatcherEventTypes events) = 0;
   virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0;
 
@@ skipping 21 matching lines @@
   virtual void CreatePointerWatcherAdapter() = 0;
 
  protected:
   explicit WmShell(std::unique_ptr<ShellDelegate> shell_delegate);
 
   // Called during startup to create the primary WindowTreeHost and
   // the corresponding RootWindowController.
   virtual void CreatePrimaryHost() = 0;
   virtual void InitHosts(const ShellInitParams& init_params) = 0;
 
-  base::ObserverList<ShellObserver>* shell_observers() {
-    return &shell_observers_;
-  }
-
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
   // Helpers to set (and initialize) or destroy various delegates.
   // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported.
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
   void DeleteWindowCycleController();
 
   void DeleteWindowSelectorController();
@@ skipping 12 matching lines @@
   // SessionStateObserver:
   void SessionStateChanged(session_manager::SessionState state) override;
 
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
   friend class WmShellTestApi;
 
   static WmShell* instance_;
 
-  base::ObserverList<ShellObserver> shell_observers_;
   std::unique_ptr<ShellDelegate> delegate_;
 
   scoped_refptr<preferences::PrefClientStore> pref_store_;
 
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<app_list::AppList> app_list_;
   std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
   std::unique_ptr<CastConfigController> cast_config_;
   std::unique_ptr<FocusCycler> focus_cycler_;
@@ skipping 27 matching lines @@
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_