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

Unified Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.h

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/test/test_session_state_delegate.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/session_state_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
index f6113d591fecf7dd217bcb61216681417ecda846..8ec2df43fdd236755a972f0411233307421fdfd1 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -40,8 +40,8 @@ class SessionStateDelegateChromeos
SessionState GetSessionState() const override;
const user_manager::UserInfo* GetUserInfo(
ash::UserIndex index) const override;
- bool ShouldShowAvatar(aura::Window* window) const override;
- gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override;
+ bool ShouldShowAvatar(ash::WmWindow* window) const override;
+ gfx::ImageSkia GetAvatarImageForWindow(ash::WmWindow* window) const override;
void SwitchActiveUser(const AccountId& account_id) override;
void CycleActiveUser(CycleUser cycle_user) override;
bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;
« no previous file with comments | « ash/test/test_session_state_delegate.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698