| Index: ash/common/wm_shell.h
|
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
|
| index 9cf207bed1e45514e483ce44b40a927ae16f0eff..8d58ec40e1163fc406ea4b5377ffa0eb674409da 100644
|
| --- a/ash/common/wm_shell.h
|
| +++ b/ash/common/wm_shell.h
|
| @@ -40,7 +40,6 @@ enum class PointerWatcherEventTypes;
|
| }
|
|
|
| namespace ash {
|
| -
|
| class AcceleratorController;
|
| class AccessibilityDelegate;
|
| class BrightnessControlDelegate;
|
| @@ -53,7 +52,6 @@ class KeyboardUI;
|
| class LocaleNotificationController;
|
| class MaximizeModeController;
|
| class MruWindowTracker;
|
| -class NewWindowDelegate;
|
| class PaletteDelegate;
|
| class ScopedDisableInternalMouseAndKeyboard;
|
| class SessionStateDelegate;
|
| @@ -82,6 +80,10 @@ class WorkspaceEventHandler;
|
| enum class LoginStatus;
|
| enum class TaskSwitchSource;
|
|
|
| +namespace mojom {
|
| +class NewWindowClient;
|
| +}
|
| +
|
| namespace wm {
|
| class MaximizeModeEventHandler;
|
| class WindowState;
|
| @@ -137,8 +139,8 @@ class ASH_EXPORT WmShell {
|
|
|
| MediaDelegate* media_delegate() { return media_delegate_.get(); }
|
|
|
| - NewWindowDelegate* new_window_delegate() {
|
| - return new_window_delegate_.get();
|
| + mojom::NewWindowClient* new_window_client() {
|
| + return new_window_client_.get();
|
| }
|
|
|
| // NOTE: Prefer ScopedRootWindowForNewWindows when setting temporarily.
|
| @@ -477,7 +479,7 @@ class ASH_EXPORT WmShell {
|
| std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
|
| std::unique_ptr<MediaDelegate> media_delegate_;
|
| std::unique_ptr<MruWindowTracker> mru_window_tracker_;
|
| - std::unique_ptr<NewWindowDelegate> new_window_delegate_;
|
| + std::unique_ptr<mojom::NewWindowClient> new_window_client_;
|
| std::unique_ptr<PaletteDelegate> palette_delegate_;
|
| std::unique_ptr<ShelfController> shelf_controller_;
|
| std::unique_ptr<ShelfDelegate> shelf_delegate_;
|
|
|