mash: Migrate ShellDelegate ownership and access to WmShell.

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/media_delegate.h"
 #include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/shell_delegate.h"

[James Cook, 2016/07/06 21:27:27]

Can this be forward declared? wm_shell.h is widely included, so it would be nice
if it didn't have too many sub-includes.

[msw, 2016/07/06 21:58:55]

Done.

 #include "base/observer_list.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class PointerWatcher;
 }
 
@@ skipping 28 matching lines @@
 
 // Similar to ash::Shell. Eventually the two will be merged.
 class ASH_EXPORT WmShell {
  public:
   // 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; }
 
+  ShellDelegate* delegate() { return delegate_.get(); }
+
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
 
   MaximizeModeController* maximize_mode_controller() {
     return maximize_mode_controller_.get();
   }
 
   MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); }
 
@@ skipping 126 matching lines @@
 #if defined(OS_CHROMEOS)
   LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
   }
 
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 #endif
 
  protected:
-  WmShell();
+  explicit WmShell(ShellDelegate* delegate);
   virtual ~WmShell();
 
   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 DeleteShellDelegate();

[James Cook, 2016/07/06 21:27:27]

I don't see this called in your CL.

[msw, 2016/07/06 21:58:55]

Removed.

   void SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate);
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
   void DeleteWindowSelectorController();
 
   void CreateMaximizeModeController();
   void DeleteMaximizeModeController();
 
   void CreateMruWindowTracker();
   void DeleteMruWindowTracker();
 
  private:
   friend class Shell;
 
   static WmShell* instance_;
 
   base::ObserverList<ShellObserver> shell_observers_;
-
+  std::unique_ptr<ShellDelegate> delegate_;
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_