| 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 588c50e91f7ab0c597884ed622c8c517514c4aa9..ebd0a92cd9d0057c999980360f0010943b5bd3b7 100644
|
| --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
|
| @@ -5,7 +5,6 @@
|
| #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
|
|
|
| #include "ash/content/shell_content_state.h"
|
| -#include "ash/wm_window.h"
|
| #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
|
| #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
|
| #include "chrome/browser/ui/ash/session_util.h"
|
| @@ -16,15 +15,14 @@ SessionStateDelegateChromeos::SessionStateDelegateChromeos() {}
|
| SessionStateDelegateChromeos::~SessionStateDelegateChromeos() {}
|
|
|
| bool SessionStateDelegateChromeos::ShouldShowAvatar(
|
| - ash::WmWindow* window) const {
|
| + aura::Window* window) const {
|
| return chrome::MultiUserWindowManager::GetInstance()->ShouldShowAvatar(
|
| - ash::WmWindow::GetAuraWindow(window));
|
| + window);
|
| }
|
|
|
| gfx::ImageSkia SessionStateDelegateChromeos::GetAvatarImageForWindow(
|
| - ash::WmWindow* window) const {
|
| + aura::Window* window) const {
|
| content::BrowserContext* context =
|
| - ash::ShellContentState::GetInstance()->GetBrowserContextForWindow(
|
| - ash::WmWindow::GetAuraWindow(window));
|
| + ash::ShellContentState::GetInstance()->GetBrowserContextForWindow(window);
|
| return GetAvatarImageForContext(context);
|
| }
|
|
|