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

Unified Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.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 | « chrome/browser/ui/ash/session_state_delegate_chromeos.h ('k') | no next file » | 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.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
index a11e164b5aca08a5605cf9bae3b1bc3b45bb8221..57fde519150dee7e1e247ae85e489b941b27f725 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
+#include "ash/aura/wm_window_aura.h"
#include "ash/content/shell_content_state.h"
#include "ash/multi_profile_uma.h"
#include "ash/session/session_state_observer.h"
@@ -145,15 +146,16 @@ const user_manager::UserInfo* SessionStateDelegateChromeos::GetUserInfo(
}
bool SessionStateDelegateChromeos::ShouldShowAvatar(
- aura::Window* window) const {
- return chrome::MultiUserWindowManager::GetInstance()->
- ShouldShowAvatar(window);
+ ash::WmWindow* window) const {
+ return chrome::MultiUserWindowManager::GetInstance()->ShouldShowAvatar(
+ ash::WmWindowAura::GetAuraWindow(window));
}
gfx::ImageSkia SessionStateDelegateChromeos::GetAvatarImageForWindow(
- aura::Window* window) const {
+ ash::WmWindow* window) const {
content::BrowserContext* context =
- ash::ShellContentState::GetInstance()->GetBrowserContextForWindow(window);
+ ash::ShellContentState::GetInstance()->GetBrowserContextForWindow(
+ ash::WmWindowAura::GetAuraWindow(window));
return GetAvatarImageForContext(context);
}
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698