diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 10:33:51 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 10:33:51 +0000 |
| commit | 5a40d60411da361e5ac216efa90a80a29ebe8b57 (patch) | |
| tree | 4abb6c2b7957a65becce19018af7b66ee555da06 /ash/frame | |
| parent | b8e9c841de80d18f9debade1fdbfafcccbfa3a5e (diff) | |
| download | chromium_src-5a40d60411da361e5ac216efa90a80a29ebe8b57.zip chromium_src-5a40d60411da361e5ac216efa90a80a29ebe8b57.tar.gz chromium_src-5a40d60411da361e5ac216efa90a80a29ebe8b57.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267158 0039d316-1c4b-4281-b951-d872f2087c98
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, 7 insertions, 4 deletions
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc index c9029ec..8ab7e23 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_state_delegate.h" +#include "ash/session/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 bfa8c33..fd26783 100644 --- a/ash/frame/frame_util.cc +++ b/ash/frame/frame_util.cc @@ -4,7 +4,8 @@ #include "ash/frame/frame_util.h" -#include "ash/session_state_delegate.h" +#include "ash/session/session_state_delegate.h" +#include "ash/session/user_info.h" #include "ash/shell.h" #include "grit/ash_resources.h" #include "ui/base/resource/resource_bundle.h" @@ -20,8 +21,10 @@ 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()->GetUserImage(context); + gfx::ImageSkia user_image = Shell::GetInstance() + ->session_state_delegate() + ->GetUserInfo(context) + ->GetImage(); gfx::ImageSkia resized = gfx::ImageSkiaOperations::CreateResizedImage( user_image, skia::ImageOperations::RESIZE_BEST, holder->size()); gfx::ImageSkia masked = |