From 6e50d42bdd5307d76a90fb398774d140f796eace Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Wed, 30 Apr 2014 17:15:12 +0000 Subject: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." > CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. > > BUG=None > R=nkostylev@chromium.org > TBR=sky@chromium.org > > Review URL: https://codereview.chromium.org/253063002 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/260783002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267250 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/frame/custom_frame_view_ash.cc | 2 +- ash/frame/frame_util.cc | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'ash/frame') 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 = -- cgit v1.1