diff options
Diffstat (limited to 'ash/frame')
| -rw-r--r-- | ash/frame/custom_frame_view_ash.cc | 2 | ||||
| -rw-r--r-- | ash/frame/frame_util.cc | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc index 8ab7e23..c9029ec 100644 --- a/ash/frame/custom_frame_view_ash.cc +++ b/ash/frame/custom_frame_view_ash.cc @@ -12,7 +12,7 @@ #include "ash/frame/frame_border_hit_test_controller.h" #include "ash/frame/frame_util.h" #include "ash/frame/header_painter.h" -#include "ash/session/session_state_delegate.h" +#include "ash/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_observer.h" #include "ash/wm/immersive_fullscreen_controller.h" diff --git a/ash/frame/frame_util.cc b/ash/frame/frame_util.cc index fd26783..bfa8c33 100644 --- a/ash/frame/frame_util.cc +++ b/ash/frame/frame_util.cc @@ -4,8 +4,7 @@ #include "ash/frame/frame_util.h" -#include "ash/session/session_state_delegate.h" -#include "ash/session/user_info.h" +#include "ash/session_state_delegate.h" #include "ash/shell.h" #include "grit/ash_resources.h" #include "ui/base/resource/resource_bundle.h" @@ -21,10 +20,8 @@ gfx::Image GetAvatarImageForContext(content::BrowserContext* context) { static const gfx::ImageSkia* holder_mask = ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( IDR_AVATAR_HOLDER_MASK); - gfx::ImageSkia user_image = Shell::GetInstance() - ->session_state_delegate() - ->GetUserInfo(context) - ->GetImage(); + gfx::ImageSkia user_image = + Shell::GetInstance()->session_state_delegate()->GetUserImage(context); gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage( user_image, skia::ImageOperations::RESIZE_BEST, holder->size()); gfx::ImageSkia masked = |