diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 17:15:12 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 17:15:12 +0000 |
| commit | 6e50d42bdd5307d76a90fb398774d140f796eace (patch) | |
| tree | d27fdbdaf6106a62fa45a48e0543eff70dde6ae4 /ash/frame/frame_util.cc | |
| parent | 3d48423a74668a7cfd71ba895a2c510ec85447b5 (diff) | |
| download | chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.zip chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.tar.gz chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.tar.bz2 | |
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
Diffstat (limited to 'ash/frame/frame_util.cc')
| -rw-r--r-- | ash/frame/frame_util.cc | 9 |
1 files changed, 3 insertions, 6 deletions
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 = |