Promotes a handful of members from WmShell 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>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/metrics/gesture_action_type.h"
 #include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/wm/lock_state_observer.h"
 #include "base/observer_list.h"
-#include "components/ui_devtools/devtools_server.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/window_types.h"
 
 namespace app_list {
 class AppList;
 }
 
-namespace base {
-class SequencedWorkerPool;
-}
-
 namespace display {
 class Display;
 class ManagedDisplayInfo;
 }
 
 namespace gfx {
 class Insets;
 class Point;
 }
 
 namespace preferences {
 class PrefClientStore;
 }
 
 namespace views {
 class PointerWatcher;
 enum class PointerWatcherEventTypes;
 }
 
 namespace ash {
 class AcceleratorController;
-class AccessibilityDelegate;
 class BrightnessControlDelegate;
 class CastConfigController;
 class FocusCycler;
 class ImmersiveContextAsh;
 class ImmersiveFullscreenController;
 class KeyEventWatcher;
 class KeyboardBrightnessControlDelegate;
 class KeyboardUI;
 class LocaleNotificationController;
 class LogoutConfirmationController;
 class MaximizeModeController;
 class MediaController;
 class MruWindowTracker;
 class NewWindowController;
-class PaletteDelegate;
 class RootWindowController;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionController;
 class SessionStateDelegate;
 class ShelfController;
 class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
 struct ShellInitParams;
 class ShutdownController;
 class SystemTrayDelegate;
 class SystemTrayController;
 class SystemTrayNotifier;
-class ToastManager;
 class VpnList;
-class WallpaperController;
 class WallpaperDelegate;
 class WindowCycleController;
 class WindowCycleEventFilter;
 class WindowResizer;
 class WindowSelectorController;
 class WmDisplayObserver;
 class WmWindow;
 class WorkspaceEventHandler;
 
 enum class LoginStatus;
 enum class TaskSwitchSource;
 
 namespace wm {
 class MaximizeModeEventHandler;
 class WindowState;
 }
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell : public SessionStateObserver {
  public:
   ~WmShell() override;
 
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
-  virtual void Initialize(const scoped_refptr<base::SequencedWorkerPool>& pool);
   virtual void Shutdown();
 
   ShellDelegate* delegate() { return delegate_.get(); }
 
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
 
-  AccessibilityDelegate* accessibility_delegate() {
-    return accessibility_delegate_.get();
-  }
-
   app_list::AppList* app_list() { return app_list_.get(); }
 
   BrightnessControlDelegate* brightness_control_delegate() {
     return brightness_control_delegate_.get();
   }
 
   CastConfigController* cast_config() { return cast_config_.get(); }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
@@ skipping 16 matching lines @@
   }
 
   MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
 
   MediaController* media_controller() { return media_controller_.get(); }
 
   NewWindowController* new_window_controller() {
     return new_window_controller_.get();
   }
 
-  PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
-
   preferences::PrefClientStore* pref_store() { return pref_store_.get(); }
 
   SessionController* session_controller() { return session_controller_.get(); }
 
   ShelfController* shelf_controller() { return shelf_controller_.get(); }
 
   ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
 
   ShelfModel* shelf_model();
 
   ShutdownController* shutdown_controller() {
     return shutdown_controller_.get();
   }
 
   SystemTrayController* system_tray_controller() {
     return system_tray_controller_.get();
   }
 
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
 
   SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
 
-  ToastManager* toast_manager() { return toast_manager_.get(); }
-
   VpnList* vpn_list() { return vpn_list_.get(); }
 
-  WallpaperController* wallpaper_controller() {
-    return wallpaper_controller_.get();
-  }
-
   WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); }
 
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
 
   WindowSelectorController* window_selector_controller() {
     return window_selector_controller_.get();
   }
 
-  const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
-    return blocking_pool_;
-  }
-
   // Returns true when ash is running as a service_manager::Service.
   virtual bool IsRunningInMash() const = 0;
 
   virtual WmWindow* GetFocusedWindow() = 0;
   virtual WmWindow* GetActiveWindow() = 0;
 
   virtual WmWindow* GetCaptureWindow() = 0;
 
   // Convenience for GetPrimaryRootWindow()->GetRootWindowController().
   RootWindowController* GetPrimaryRootWindowController();
@@ skipping 142 matching lines @@
   virtual void AddPointerWatcher(views::PointerWatcher* watcher,
                                  views::PointerWatcherEventTypes events) = 0;
   virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0;
 
   // TODO: Move these back to LockStateController when that has been moved.
   void OnLockStateEvent(LockStateObserver::EventType event);
   void AddLockStateObserver(LockStateObserver* observer);
   void RemoveLockStateObserver(LockStateObserver* observer);
 
   void SetShelfDelegateForTesting(std::unique_ptr<ShelfDelegate> test_delegate);
-  void SetPaletteDelegateForTesting(
-      std::unique_ptr<PaletteDelegate> palette_delegate);
 
   // True if any touch points are down.
   virtual bool IsTouchDown() = 0;
 
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 
   // Enable or disable the laser pointer.
   virtual void SetLaserPointerEnabled(bool enabled) = 0;
 
@@ skipping 20 matching lines @@
   void DeleteWindowCycleController();
 
   void DeleteWindowSelectorController();
 
   void CreateMaximizeModeController();
   void DeleteMaximizeModeController();
 
   void CreateMruWindowTracker();
   void DeleteMruWindowTracker();
 
-  void DeleteToastManager();
-
   void SetAcceleratorController(
       std::unique_ptr<AcceleratorController> accelerator_controller);
 
   // SessionStateObserver:
   void SessionStateChanged(session_manager::SessionState state) override;
 
  private:
   friend class AcceleratorControllerTest;
   friend class Shell;
   friend class WmShellTestApi;
 
   static WmShell* instance_;
 
   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_;
   std::unique_ptr<ImmersiveContextAsh> immersive_context_;
   std::unique_ptr<KeyboardBrightnessControlDelegate>
       keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<LocaleNotificationController> locale_notification_controller_;
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaController> media_controller_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<NewWindowController> new_window_controller_;
-  std::unique_ptr<PaletteDelegate> palette_delegate_;
   std::unique_ptr<SessionController> session_controller_;
   std::unique_ptr<ShelfController> shelf_controller_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
   std::unique_ptr<ShutdownController> shutdown_controller_;
   std::unique_ptr<SystemTrayController> system_tray_controller_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
-  std::unique_ptr<ToastManager> toast_manager_;
   std::unique_ptr<VpnList> vpn_list_;
-  std::unique_ptr<WallpaperController> wallpaper_controller_;
   std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
-  std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
 
   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_