Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/frame/frame_util.cc

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/frame/custom_frame_view_ash.cc ('k') | trunk/src/ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/frame/frame_util.cc
===================================================================
--- trunk/src/ash/frame/frame_util.cc (revision 267249)
+++ trunk/src/ash/frame/frame_util.cc (working copy)
@@ -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 @@
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 =
« no previous file with comments | « trunk/src/ash/frame/custom_frame_view_ash.cc ('k') | trunk/src/ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698