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

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

Issue 2041423002: Moves MruWindowTracker to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mru_window_tracker
Patch Set: wm 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
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index effc0ec58b469c140938b8fbf46d539c35b902a7..1e98fc45ee3b413a33be671bdee1baeb28f5a66c 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -6,8 +6,10 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_window_ids.h"
+#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_activation_observer.h"
+#include "ash/common/wm_shell_common.h"
#include "ash/mus/bridge/wm_root_window_controller_mus.h"
#include "ash/mus/bridge/wm_window_mus.h"
#include "ash/mus/container_ids.h"
@@ -89,9 +91,13 @@ WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
: client_(client), session_state_delegate_(new SessionStateDelegateStub) {
client_->AddObserver(this);
WmShell::Set(this);
+
+ wm_shell_common_.reset(new WmShellCommon);
+ wm_shell_common_->CreateMruWindowTracker();
}
WmShellMus::~WmShellMus() {
+ wm_shell_common_->DeleteMruWindowTracker();
RemoveClientObserver();
WmShell::Set(nullptr);
}
@@ -135,6 +141,10 @@ WmRootWindowControllerMus* WmShellMus::GetRootWindowControllerWithDisplayId(
return nullptr;
}
+MruWindowTracker* WmShellMus::GetMruWindowTracker() {
+ return wm_shell_common_->mru_window_tracker();
+}
+
WmWindow* WmShellMus::NewContainerWindow() {
return WmWindowMus::Get(client_->NewWindow());
}
@@ -160,16 +170,6 @@ WmWindow* WmShellMus::GetRootWindowForNewWindows() {
return root_window_controllers_[0]->GetWindow();
}
-std::vector<WmWindow*> WmShellMus::GetMruWindowList() {
- NOTIMPLEMENTED();
- return std::vector<WmWindow*>();
-}
-
-std::vector<WmWindow*> WmShellMus::GetMruWindowListIgnoreModals() {
- NOTIMPLEMENTED();
- return std::vector<WmWindow*>();
-}
-
bool WmShellMus::IsForceMaximizeOnFirstRun() {
NOTIMPLEMENTED();
return false;
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698