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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/ash/system/user/tray_user.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/system/user/tray_user.h ('k') | trunk/src/ash/system/user/tray_user_separator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/system/user/tray_user.cc
===================================================================
--- trunk/src/ash/system/user/tray_user.cc (revision 267249)
+++ trunk/src/ash/system/user/tray_user.cc (working copy)
@@ -6,8 +6,7 @@
#include "ash/ash_switches.h"
#include "ash/root_window_controller.h"
-#include "ash/session/session_state_delegate.h"
-#include "ash/session/user_info.h"
+#include "ash/session_state_delegate.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell_delegate.h"
#include "ash/system/tray/system_tray.h"
@@ -264,7 +263,7 @@
content::BrowserContext* context = session_state_delegate->
GetBrowserContextByIndex(GetTrayIndex());
- avatar_->SetImage(session_state_delegate->GetUserInfo(context)->GetImage(),
+ avatar_->SetImage(session_state_delegate->GetUserImage(context),
gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
// Unit tests might come here with no images for some users.
« no previous file with comments | « trunk/src/ash/system/user/tray_user.h ('k') | trunk/src/ash/system/user/tray_user_separator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698