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

Unified Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.cc

Issue 197773004: Move avatar holder code to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix Created 6 years, 9 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
Index: chrome/browser/ui/ash/session_state_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
index 141d9d8f1783b00e032f47f351d4ebd2e8266011..4dd49cccb2afc689b8b91bc984cda723708d5241 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
@@ -28,6 +29,15 @@ SessionStateDelegateChromeos::SessionStateDelegateChromeos() {
SessionStateDelegateChromeos::~SessionStateDelegateChromeos() {
}
+content::BrowserContext* SessionStateDelegateChromeos::GetBrowserContextByIndex(
+ ash::MultiProfileIndex index) {
+ DCHECK_LT(index, NumberOfLoggedInUsers());
+ chromeos::User* user =
+ chromeos::UserManager::Get()->GetLRULoggedInUsers()[index];
+ DCHECK(user);
+ return chromeos::UserManager::Get()->GetProfileByUser(user);
+}
+
int SessionStateDelegateChromeos::GetMaximumNumberOfLoggedInUsers() const {
// We limit list of logged in users to 10 due to memory constraints.
// Note that 10 seems excessive, but we want to test how many users are
@@ -114,19 +124,15 @@ const std::string SessionStateDelegateChromeos::GetUserID(
}
const gfx::ImageSkia& SessionStateDelegateChromeos::GetUserImage(
- ash::MultiProfileIndex index) const {
- DCHECK_LT(index, NumberOfLoggedInUsers());
- return chromeos::UserManager::Get()->GetLRULoggedInUsers()[index]->image();
+ content::BrowserContext* context) const {
+ DCHECK(context);
+ return chromeos::UserManager::Get()->GetUserByProfile(
+ Profile::FromBrowserContext(context))->image();
}
-void SessionStateDelegateChromeos::GetLoggedInUsers(ash::UserIdList* users) {
- const chromeos::UserList& logged_in_users =
- chromeos::UserManager::Get()->GetLoggedInUsers();
- for (chromeos::UserList::const_iterator it = logged_in_users.begin();
- it != logged_in_users.end(); ++it) {
- const chromeos::User* user = (*it);
- users->push_back(user->email());
- }
+bool SessionStateDelegateChromeos::ShouldShowAvatar(aura::Window* window) {
+ return chrome::MultiUserWindowManager::GetInstance()->
+ ShouldShowAvatar(window);
}
void SessionStateDelegateChromeos::SwitchActiveUser(
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.h ('k') | chrome/browser/ui/ash/session_state_delegate_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698