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

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

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 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 7470b3d027a01dddba37d84e3145a544e30fbd4c..3d78af36f02a599854fd0dd39f5e6e09b79d3eee 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
@@ -5,9 +5,9 @@
#include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/shell_port.h"
#include "ash/wallpaper/wallpaper_delegate.h"
@@ -231,7 +231,7 @@ void UserSwitchAnimatorChromeOS::TransitionUserShelf(
new_account_id_.GetUserEmail());
// Hide the black rectangle on top of each shelf again.
for (aura::Window* window : ash::Shell::GetAllRootWindows()) {
- ash::ShelfWidget* shelf = ash::WmShelf::ForWindow(window)->shelf_widget();
+ ash::ShelfWidget* shelf = ash::Shelf::ForWindow(window)->shelf_widget();
shelf->HideShelfBehindBlackBar(false, duration_override);
}
// We kicked off the shelf animation above and the override can be
@@ -263,7 +263,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(window);
+ ash::Shelf* shelf = ash::Shelf::ForWindow(window);
if (GetScreenCover(window) != NO_USER_COVERS_SCREEN &&
(!chrome_launcher_controller ||
!chrome_launcher_controller->ShelfBoundsChangesProbablyWithUser(

Powered by Google App Engine
This is Rietveld 408576698