chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc - Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger.

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/options/chromeos/accounts_options_handler.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)

Patch Set: Removed unused #includes Created 4 years, 2 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/app_list/app_list_controller_browsertest.cc ('k') | chrome/browser/ui/webui/options/chromeos/guest_mode_options_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

index 523700c058571f50540a279e2c9f17ad85ba314c..3bc6537dba7194a568c22b8712b268a0e09e2d71 100644

--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

@@ -23,10 +23,10 @@

#include "chrome/browser/profiles/profile_metrics.h"

#include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"

#include "chrome/grit/generated_resources.h"

-#include "chromeos/login/user_names.h"

#include "chromeos/settings/cros_settings_names.h"

#include "components/prefs/pref_service.h"

#include "components/user_manager/user_manager.h"

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

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

#include "google_apis/gaia/gaia_auth_util.h"

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

@@ -159,7 +159,7 @@ void AccountsOptionsHandler::HandleUpdateWhitelist(

std::string whitelisted_user;

new_list->GetString(i, &whitelisted_user);

if (gaia::ExtractDomainName(whitelisted_user) ==

- chromeos::login::kSupervisedUserDomain) {

+ user_manager::kSupervisedUserDomain) {

new_list->Remove(i, NULL);

--i;

}