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

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

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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 da9c45f384c2dd6c8483c802a89f4b8e7012834d..1d5ba2508c98d150eb8772c078a6f908c02ec1a0 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
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/shelf/shelf_layout_manager.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
@@ -265,8 +264,7 @@ void UserSwitchAnimatorChromeOS::TransitionUserShelf(
// CPU usage and therefore effect jank, we should avoid hiding the shelf if
// the start and end location are the same and cover the shelf instead with
// a black rectangle on top.
- ash::WmShelf* shelf =
- ash::WmShelf::ForWindow(ash::WmWindowAura::Get(window));
+ ash::WmShelf* shelf = ash::WmShelf::ForWindow(ash::WmWindow::Get(window));
if (GetScreenCover(window) != NO_USER_COVERS_SCREEN &&
(!chrome_launcher_controller ||
!chrome_launcher_controller->ShelfBoundsChangesProbablyWithUser(
@@ -367,7 +365,7 @@ void UserSwitchAnimatorChromeOS::TransitionWindows(
}
case ANIMATION_STEP_FINALIZE: {
// Reactivate the MRU window of the new user.
- aura::Window::Windows mru_list = ash::WmWindowAura::ToAuraWindows(
+ aura::Window::Windows mru_list = ash::WmWindow::ToAuraWindows(
ash::WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
if (!mru_list.empty()) {
aura::Window* window = mru_list[0];

Powered by Google App Engine
This is Rietveld 408576698