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

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments 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/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 c549694e9c3ea326325c6e914f480ce613bf47d5..7c96d8a015e80b3a83b36019696d5fc9e6f3d21d 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -8,9 +8,9 @@
#include <vector>
#include "ash/common/shell_window_ids.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/desktop_background/user_wallpaper_delegate.h"
#include "ash/public/interfaces/container.mojom.h"
#include "ash/shell.h"
#include "base/bind.h"
@@ -861,8 +861,8 @@ void LoginDisplayHostImpl::Observe(
VLOG(1) << "Login WebUI >> wp animation done";
is_wallpaper_loaded_ = true;
if (!chrome::IsRunningInMash()) {
- ash::Shell::GetInstance()
- ->user_wallpaper_delegate()
+ ash::WmShell::Get()
+ ->wallpaper_delegate()
->OnWallpaperBootAnimationFinished();
} else {
NOTIMPLEMENTED();
« no previous file with comments | « chrome/browser/chromeos/background/ash_wallpaper_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698