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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2041423002: Moves MruWindowTracker to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mru_window_tracker
Patch Set: comment Created 4 years, 6 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
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 4615290a0887c0c2b70e3dffa53e2eb244c0a6c8..1b8159337df59c675ca4035eaeb6c710e5624836 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -19,6 +19,9 @@ class WindowTreeClient;
}
namespace ash {
+
+class ShellCommon;
+
namespace mus {
class WmRootWindowControllerMus;
@@ -42,14 +45,13 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
// WmShell:
+ MruWindowTracker* GetMruWindowTracker() override;
WmWindow* NewContainerWindow() override;
WmWindow* GetFocusedWindow() override;
WmWindow* GetActiveWindow() override;
WmWindow* GetPrimaryRootWindow() override;
WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
WmWindow* GetRootWindowForNewWindows() override;
- std::vector<WmWindow*> GetMruWindowList() override;
- std::vector<WmWindow*> GetMruWindowListIgnoreModals() override;
bool IsForceMaximizeOnFirstRun() override;
bool CanShowWindowForUser(WmWindow* window) override;
void LockCursor() override;
@@ -82,6 +84,8 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
::mus::WindowTreeClient* client_;
+ std::unique_ptr<ShellCommon> shell_common_;
+
std::vector<WmRootWindowControllerMus*> root_window_controllers_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;

Powered by Google App Engine
This is Rietveld 408576698