chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/webui/chromeos/login/gaia_screen_handler.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/webui/chromeos/login/error_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

index b66ae6acb95a5641057d1fde25d5621e42f819f7..7e84e9d42919c9e2b9a6f3090181ea2ba0bbd1db 100644

--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

-#include "chrome/browser/chromeos/login/users/user_manager.h"

#include "chrome/browser/chromeos/policy/consumer_management_service.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

@@ -21,6 +20,7 @@

#include "chrome/browser/ui/webui/signin/inline_login_ui.h"

#include "chromeos/chromeos_switches.h"

#include "chromeos/settings/cros_settings_names.h"

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

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_frame_host.h"

#include "google_apis/gaia/gaia_auth_util.h"

@@ -59,7 +59,7 @@ void UpdateAuthParams(base::DictionaryValue* params,

// 3. New users are allowed by owner.

// 4. Supervised users are allowed by owner.

bool supervised_users_allowed =

- UserManager::Get()->AreSupervisedUsersAllowed();

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

bool supervised_users_can_create = true;

int message_id = -1;

if (!has_users) {

@@ -306,7 +306,8 @@ void GaiaScreenHandler::HandleCompleteLogin(const std::string& typed_email,

}

// Consumer management enrollment is in progress.

- const std::string owner_email = UserManager::Get()->GetOwnerEmail();

+ const std::string owner_email =

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

if (typed_email != owner_email) {

// Show Gaia sign-in screen again, since we only allow the owner to sign

// in.