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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.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/chromeos/login/ui/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
index f779c5af9e9e5810c5a0f79bed9619aaba805257..a6bcc1fd01e8878c9bd3a987f69b6bcf14bff2e0 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -9,10 +9,10 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
+#include "ash/shell_port.h"
#include "ash/system/tray/system_tray.h"
#include "ash/wallpaper/wallpaper_controller.h"
#include "ash/wallpaper/wallpaper_delegate.h"
-#include "ash/wm_shell.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/location.h"
@@ -559,7 +559,7 @@ void LoginDisplayHostImpl::Finalize() {
// When adding another user into the session, we defer the wallpaper's
// animation in order to prevent the flashing of the previous user's windows.
// See crbug.com/541864.
- if (ash::WmShell::HasInstance() &&
+ if (ash::ShellPort::HasInstance() &&
finalize_animation_type_ != ANIMATION_ADD_USER) {
ash::Shell::Get()->wallpaper_controller()->MoveToUnlockedContainer();
}

Powered by Google App Engine
This is Rietveld 408576698