chromeos: Promotes 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 35 matching lines @@
 namespace display {
 class DisplayChangeObserver;
 class DisplayConfigurator;
 class DisplayManager;
 }
 
 namespace gfx {
 class Insets;
 }
 
+namespace preferences {
+class PrefClientStore;
+}
+
 namespace ui {
 class UserActivityDetector;
 class UserActivityPowerManagerNotifier;
 namespace devtools {
 class UiDevToolsServer;
 }
 }
 
 namespace views {
 class NonClientFrameView;
@@ skipping 45 matching lines @@
 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 ToplevelWindowEventHandler;
 class ScreenLayoutObserver;
 class ToastManager;
 class VirtualKeyboardController;
 class VideoActivityNotifier;
 class VideoDetector;
 class WallpaperController;
+class WallpaperDelegate;
 class WebNotificationTray;
 class WindowPositioner;
 class WindowTreeHostManager;
 class WmShell;
 class WmWindow;
 
 namespace shell {
 class WindowWatcher;
 }
 
@@ skipping 12 matching lines @@
                          public aura::client::ActivationChangeObserver {
  public:
   typedef std::vector<RootWindowController*> RootWindowControllerList;
 
   // A shell must be explicitly created so that it can call |Init()| with the
   // delegate set. |delegate| can be NULL (if not required for initialization).
   // Takes ownership of |delegate|.
   static Shell* CreateInstance(const ShellInitParams& init_params);
 
   // Should never be called before |CreateInstance()|.
-  static Shell* GetInstance();
+  // TODO: deprecated. Use Get() instead. GetInstance() will be renamed close
+  // to branch point.
+  static Shell* GetInstance() { return Get(); }
+  static Shell* Get();
 
   // Returns true if the ash shell has been instantiated.
   static bool HasInstance();
 
   static void DeleteInstance();
 
   // Returns the root window controller for the primary root window.
   // TODO(oshima): move this to |RootWindowController|
   static RootWindowController* GetPrimaryRootWindowController();
 
@@ skipping 105 matching lines @@
   void set_link_handler_model_factory(
       LinkHandlerModelFactory* link_handler_model_factory) {
     link_handler_model_factory_ = link_handler_model_factory;
   }
   PowerButtonController* power_button_controller() {
     return power_button_controller_.get();
   }
   LockStateController* lock_state_controller() {
     return lock_state_controller_.get();
   }
+  preferences::PrefClientStore* pref_store() { return pref_store_.get(); }
   PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
+  ShellDelegate* delegate() { return delegate_.get(); }

[James Cook, 2017/03/11 00:40:43]

optional: Since you're moving it, and there are already a bunch of foo_delegates
here, WDYT of renaming this to shell_delegate_?

[sky, 2017/03/13 15:23:19]

Done.

   VideoDetector* video_detector() { return video_detector_.get(); }
   WallpaperController* wallpaper_controller() {
     return wallpaper_controller_.get();
   }
+  WallpaperDelegate* wallpaper_delegate() { return wallpaper_delegate_.get(); }
   WindowTreeHostManager* window_tree_host_manager() {
     return window_tree_host_manager_.get();
   }
   PowerEventObserver* power_event_observer() {
     return power_event_observer_.get();
   }
   AshTouchTransformController* touch_transformer_controller() {
     return touch_transformer_controller_.get();
   }
   LaserPointerController* laser_pointer_controller() {
@@ skipping 171 matching lines @@
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate);
   friend class RootWindowController;
   friend class ScopedRootWindowForNewWindows;
   friend class SmsObserverTest;
   friend class test::ShellTestApi;
   friend class shell::WindowWatcher;
 
-  explicit Shell(std::unique_ptr<WmShell> wm_shell);
+  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);
 
@@ skipping 34 matching lines @@
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
   std::unique_ptr<AcceleratorControllerDelegateAura>
       accelerator_controller_delegate_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
   std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
   std::unique_ptr<PaletteDelegate> palette_delegate_;
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
+  std::unique_ptr<ShellDelegate> 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_;
+  scoped_refptr<preferences::PrefClientStore> pref_store_;
   std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_;
   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
   LinkHandlerModelFactory* link_handler_model_factory_;
   std::unique_ptr<PowerButtonController> power_button_controller_;
   std::unique_ptr<LockStateController> lock_state_controller_;
   std::unique_ptr<ui::UserActivityDetector> user_activity_detector_;
   std::unique_ptr<VideoDetector> video_detector_;
   std::unique_ptr<WindowTreeHostManager> window_tree_host_manager_;
   std::unique_ptr<HighContrastController> high_contrast_controller_;
   std::unique_ptr<MagnificationController> magnification_controller_;
@@ skipping 95 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_