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

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

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move shelf notify functions to WmShell. Created 4 years, 4 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 c13ba13f3cc8262e5d1b502f7039a5fe85dc30d1..bdbe65594fad34934f95ad4a3c367febcdcdaa3a 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
@@ -9,6 +9,7 @@
#include "ash/common/wm/window_positioner.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf.h"
@@ -231,7 +232,7 @@ void UserSwitchAnimatorChromeOS::TransitionUserShelf(
chrome_launcher_controller->ActiveUserChanged(
new_account_id_.GetUserEmail());
// Hide the black rectangle on top of each shelf again.
- for (aura::Window* window : ash::Shell::GetAllRootWindows()) {
+ for (ash::WmWindow* window : ash::WmShell::Get()->GetAllRootWindows()) {
ash::ShelfWidget* shelf = ash::Shelf::ForWindow(window)->shelf_widget();
shelf->HideShelfBehindBlackBar(false, duration_override);
}
@@ -264,7 +265,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::Shelf* shelf = ash::Shelf::ForWindow(window);
+ ash::Shelf* shelf = ash::Shelf::ForWindow(ash::WmWindowAura::Get(window));
if (GetScreenCover(window) != NO_USER_COVERS_SCREEN &&
(!chrome_launcher_controller ||
!chrome_launcher_controller->ShelfBoundsChangesProbablyWithUser(

Powered by Google App Engine
This is Rietveld 408576698