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

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 2042333002: mash: Migrate SessionStateDelegate interface to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove semicolon Created 4 years, 6 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 | « ash/session/session_state_delegate.h ('k') | ash/sysui/shell_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 6bf433f6c984788deaec3ccaca1ad66362334a52..e35da8627957677bab391932d1f2ac8a40f5d020 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -116,10 +116,10 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
return user_info_.get();
}
- bool ShouldShowAvatar(aura::Window* window) const override {
+ bool ShouldShowAvatar(WmWindow* window) const override {
return !user_info_->GetImage().isNull();
}
- gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override {
+ gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {
return gfx::ImageSkia();
}
void SwitchActiveUser(const AccountId& account_id) override {}
« no previous file with comments | « ash/session/session_state_delegate.h ('k') | ash/sysui/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698