Move more from WmShell to Shell

ash/shell.h

 // Copyright (c) 2012 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_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 77 matching lines @@
 
 namespace ash {
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class AppListDelegateImpl;
 class AshNativeCursorManager;
 class AshTouchTransformController;
 class AutoclickController;
 class BluetoothNotificationController;
+class BrightnessControlDelegate;
+class CastConfigController;
 class DisplayColorManager;
 class DisplayConfigurationController;
 class DisplayErrorObserver;
 class DragDropController;
 class EventClientImpl;
 class EventTransformationHandler;
 class FirstRunHelper;
+class FocusCycler;
 class GPUSupport;
 class HighContrastController;
 class ImmersiveHandlerFactoryAsh;
+class KeyboardBrightnessControlDelegate;
+class KeyboardUI;
 class LaserPointerController;
 class LinkHandlerModelFactory;
+class LocaleNotificationController;
 class LockStateController;
 enum class LoginStatus;
+class LogoutConfirmationController;
 class MagnificationController;
 class MouseCursorEventFilter;
 class OverlayEventFilter;
 class PaletteDelegate;
 class PartialMagnificationController;
 class PowerButtonController;
 class PowerEventObserver;
 class ProjectingObserver;
 class ResizeShadowController;
 class ResolutionNotificationController;
 class RootWindowController;
 class ScopedOverviewAnimationSettingsFactoryAura;
 class ScreenOrientationController;
 class ScreenshotController;
 class ScreenPinningController;
 class ScreenPositionController;
 class SessionStateDelegate;
 class ShellDelegate;
 struct ShellInitParams;
 class ShellObserver;
 class ShutdownObserver;
 class SmsObserver;
 class StickyKeysController;
 class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
 class SystemTray;
+class SystemTrayController;
+class SystemTrayDelegate;
 class ToplevelWindowEventHandler;
 class ScreenLayoutObserver;
 class ToastManager;
 class VirtualKeyboardController;
 class VideoActivityNotifier;
 class VideoDetector;
 class WallpaperController;
 class WallpaperDelegate;
 class WebNotificationTray;
 class WindowPositioner;
@@ skipping 128 matching lines @@
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
   AccessibilityDelegate* accessibility_delegate() {
     return accessibility_delegate_.get();
   }
   app_list::AppList* app_list() { return app_list_.get(); }
   const scoped_refptr<base::SequencedWorkerPool>& blocking_pool() {
     return blocking_pool_;
   }
+  BrightnessControlDelegate* brightness_control_delegate() {
+    return brightness_control_delegate_.get();
+  }
+  CastConfigController* cast_config() { return cast_config_.get(); }
   display::DisplayManager* display_manager() { return display_manager_.get(); }
   DisplayConfigurationController* display_configuration_controller() {
     return display_configuration_controller_.get();
   }
   ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
+  FocusCycler* focus_cycler() { return focus_cycler_.get(); }
+  KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() {
+    return keyboard_brightness_control_delegate_.get();
+  }
+  KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
+  LocaleNotificationController* locale_notification_controller() {
+    return locale_notification_controller_.get();
+  }
+  LogoutConfirmationController* logout_confirmation_controller() {
+    return logout_confirmation_controller_.get();
+  }
+  SystemTrayController* system_tray_controller() {

[msw, 2017/03/20 22:00:40]

nit: these probably belong lower for abc ordering.

[sky, 2017/03/20 22:07:38]

I think it's mostly a mess here and I'm holding off on reordering it all. For
example, tooltip_controller() shouldn't be before overlay_filter. Similarly the
members are all a jumble...

+    return system_tray_controller_.get();
+  }
+  SystemTrayDelegate* system_tray_delegate() {
+    return system_tray_delegate_.get();
+  }
   views::corewm::TooltipController* tooltip_controller() {
     return tooltip_controller_.get();
   }
   OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
   LinkHandlerModelFactory* link_handler_model_factory() {
     return link_handler_model_factory_;
   }
   void set_link_handler_model_factory(
       LinkHandlerModelFactory* link_handler_model_factory) {
     link_handler_model_factory_ = link_handler_model_factory;
@@ skipping 206 matching lines @@
   void NotifyShelfAlignmentChanged(WmWindow* root_window);
 
   // Notifies observers that |root_window|'s shelf changed auto-hide behavior.
   // TODO(jamescook): Move to Shelf.
   void NotifyShelfAutoHideBehaviorChanged(WmWindow* root_window);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
+  friend class AcceleratorControllerTest;
   friend class RootWindowController;
   friend class ScopedRootWindowForNewWindows;
   friend class SmsObserverTest;
   friend class test::ShellTestApi;
   friend class shell::WindowWatcher;
 
   Shell(std::unique_ptr<ShellDelegate> shell_delegate,
         std::unique_ptr<WmShell> wm_shell);
   ~Shell() override;
 
   void Init(const ShellInitParams& init_params);
 
   // Initializes virtual keyboard controller.
   void InitKeyboard();
 
   // Initializes the root window so that it can host browser windows.
   void InitRootWindow(aura::Window* root_window);
 
+  // Helpers to set (and initialize) or destroy various delegates.
+  // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported.

[msw, 2017/03/20 22:00:40]

nit: maybe keep this comment in WmShell?

[sky, 2017/03/20 22:07:38]

As discussed over IM I nuked the comment.

+  void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
+  void DeleteSystemTrayDelegate();
+
   // Destroys all child windows including widgets across all roots.
   void CloseAllRootWindowChildWindows();
 
   // SystemModalContainerEventFilterDelegate:
   bool CanWindowReceiveEvents(aura::Window* window) override;
 
   // Overridden from ui::EventTarget:
   bool CanAcceptEvent(const ui::Event& event) override;
   EventTarget* GetParentTarget() override;
   std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
@@ skipping 20 matching lines @@
 
   // The CompoundEventFilter owned by aura::Env object.
   std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
 
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
   std::unique_ptr<AcceleratorController> accelerator_controller_;
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
+  std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
+  std::unique_ptr<CastConfigController> cast_config_;
+  std::unique_ptr<DragDropController> drag_drop_controller_;
+  std::unique_ptr<FocusCycler> focus_cycler_;
+  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<PaletteDelegate> palette_delegate_;
-  std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<ShellDelegate> shell_delegate_;
+  std::unique_ptr<SystemTrayController> system_tray_controller_;
+  std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<ToastManager> toast_manager_;
   std::unique_ptr<WallpaperController> wallpaper_controller_;
   std::unique_ptr<WallpaperDelegate> wallpaper_delegate_;
   std::unique_ptr<::wm::ShadowController> shadow_controller_;
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
   std::unique_ptr<app_list::AppList> app_list_;
   scoped_refptr<preferences::PrefClientStore> pref_store_;
   std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
@@ skipping 103 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_