| 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);
|
| }
|
|
|
|
|