chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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 | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

index d2a61b2847a852d83fbd7ba047d9c5624e29e5e5..f9100aa126762bb9b45c0ad625fee2114db6252b 100644

--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

@@ -12,7 +12,6 @@

#include "base/prefs/pref_service.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/app/chrome_command_ids.h"

-#include "chrome/browser/chromeos/login/users/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_util.h"

@@ -20,6 +19,7 @@

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

#include "chrome/common/pref_names.h"

#include "components/user_manager/user.h"

+#include "components/user_manager/user_manager.h"

#include "grit/generated_resources.h"

#include "ui/aura/window.h"

#include "ui/base/l10n/l10n_util.h"

@@ -130,7 +130,7 @@ void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) {

// Don't show warning dialog if any logged in user in multi-profiles

// session dismissed it.

const user_manager::UserList logged_in_users =

- chromeos::UserManager::Get()->GetLoggedInUsers();

+ user_manager::UserManager::Get()->GetLoggedInUsers();

for (user_manager::UserList::const_iterator it = logged_in_users.begin();

it != logged_in_users.end();

++it) {