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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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 ee8327fd758b7561c5c076b3d94d5d604e14fc68..84801583f6bac1efc8af150be9abf08f9b615089 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,13 +9,13 @@
#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"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/window_positioner.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm_shell.h"
#include "ash/wm_window.h"
#include "base/macros.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
@@ -231,7 +231,7 @@ void UserSwitchAnimatorChromeOS::TransitionUserShelf(
chrome_launcher_controller->ActiveUserChanged(
new_account_id_.GetUserEmail());
// Hide the black rectangle on top of each shelf again.
- for (ash::WmWindow* window : ash::WmShell::Get()->GetAllRootWindows()) {
+ for (ash::WmWindow* window : ash::ShellPort::Get()->GetAllRootWindows()) {
ash::ShelfWidget* shelf = ash::WmShelf::ForWindow(window)->shelf_widget();
shelf->HideShelfBehindBlackBar(false, duration_override);
}

Powered by Google App Engine
This is Rietveld 408576698