Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2622)

Unified Diff: ash/common/wm_shell.h

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ash/common/test/wm_shell_test_api.cc ('k') | ash/common/wm_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698