ash/shell/shell_delegate_impl.cc - Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper)

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: ash/shell/shell_delegate_impl.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)

Patch Set: [mus+ash] Removes WmWindow from ash (cleaning remaining wm_window.h in c/b/ui) 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:

Index: ash/shell/shell_delegate_impl.cc

diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc

index e9112bac622fa58e48c0fb014306e3919a763860..e0f932bdcc3a6c4206135b485b13957e06478170 100644

--- a/ash/shell/shell_delegate_impl.cc

+++ b/ash/shell/shell_delegate_impl.cc

@@ -66,10 +66,10 @@ class SessionStateDelegateImpl : public SessionStateDelegate {

~SessionStateDelegateImpl() override {}

// SessionStateDelegate:

- bool ShouldShowAvatar(WmWindow* window) const override {

+ bool ShouldShowAvatar(aura::Window* window) const override {

return !user_info_->GetImage().isNull();

}

- gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {

+ gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override {

return gfx::ImageSkia();

}