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

Unified Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: Created 3 years, 9 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: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
index ca9a7fac860821ba9cbeef755e3198d0c9d56ec2..0946c8713db95c6d3c4c4c165e603ec0ee402088 100644
--- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
@@ -41,12 +41,12 @@ class UserChangeActionDisabler {
public:
UserChangeActionDisabler() {
ash::WindowPositioner::DisableAutoPositioning(true);
- ash::WmShell::Get()->mru_window_tracker()->SetIgnoreActivations(true);
+ ash::Shell::Get()->mru_window_tracker()->SetIgnoreActivations(true);
}
~UserChangeActionDisabler() {
ash::WindowPositioner::DisableAutoPositioning(false);
- ash::WmShell::Get()->mru_window_tracker()->SetIgnoreActivations(false);
+ ash::Shell::Get()->mru_window_tracker()->SetIgnoreActivations(false);
}
private:
@@ -366,7 +366,7 @@ void UserSwitchAnimatorChromeOS::TransitionWindows(
case ANIMATION_STEP_FINALIZE: {
// Reactivate the MRU window of the new user.
aura::Window::Windows mru_list = ash::WmWindow::ToAuraWindows(
- ash::WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
+ ash::Shell::Get()->mru_window_tracker()->BuildMruWindowList());
if (!mru_list.empty()) {
aura::Window* window = mru_list[0];
ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);

Powered by Google App Engine
This is Rietveld 408576698