chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc - Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.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

« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 e67bbab607da5c6dd18d2eef975fe76c6a545fd0..9f2229c6eaf58c2ed712a66a144b1c784cb96878 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,12 +9,12 @@

#include "ash/common/shelf/shelf_layout_manager.h"

#include "ash/common/shelf/shelf_widget.h"

#include "ash/common/shelf/wm_shelf.h"

+#include "ash/common/wallpaper/wallpaper_delegate.h"

#include "ash/common/wm/mru_window_tracker.h"

#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/shell.h"

#include "ash/wm/window_state_aura.h"

@@ -192,8 +192,8 @@ void UserSwitchAnimatorChromeOS::FinalizeAnimation() {

void UserSwitchAnimatorChromeOS::TransitionWallpaper(

AnimationStep animation_step) {

// Handle the wallpaper switch.

- ash::UserWallpaperDelegate* wallpaper_delegate =

- ash::Shell::GetInstance()->user_wallpaper_delegate();

+ ash::WallpaperDelegate* wallpaper_delegate =

+ ash::WmShell::Get()->wallpaper_delegate();

if (animation_step == ANIMATION_STEP_HIDE_OLD_USER) {

// Set the wallpaper cross dissolve animation duration to our complete

// animation cycle for a fade in and fade out.