Converts WmActivationObserver to aura::client::ActivationChangeObserver

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 72 matching lines @@
 class SystemTrayController;
 class SystemTrayNotifier;
 class ToastManager;
 class VpnList;
 class WallpaperController;
 class WallpaperDelegate;
 class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
 class WindowSelectorController;
-class WmActivationObserver;
 class WmDisplayObserver;
 class WmWindow;
 class WorkspaceEventHandler;
 
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
@@ skipping 298 matching lines @@
   // 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;
 
-  void AddActivationObserver(WmActivationObserver* observer);
-  void RemoveActivationObserver(WmActivationObserver* observer);
-
   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.
@@ skipping 66 matching lines @@
  private:
   friend class AcceleratorControllerTest;
   friend class ScopedRootWindowForNewWindows;
   friend class Shell;
   friend class WmShellTestApi;
 
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(ActivationReason reason,
                          aura::Window* gained_active,
                          aura::Window* lost_active) override;
-  void OnAttemptToReactivateWindow(aura::Window* request_active,
-                                   aura::Window* actual_active) override;
 
   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_;
@@ skipping 29 matching lines @@
   std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
 
   base::ObserverList<LockStateObserver> lock_state_observers_;
 
   // See comment for GetRootWindowForNewWindows().
   WmWindow* root_window_for_new_windows_ = nullptr;
   WmWindow* scoped_root_window_for_new_windows_ = nullptr;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
-  bool added_activation_observer_ = false;
-  base::ObserverList<WmActivationObserver> activation_observers_;
-
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_