chrome/browser/chromeos/login/managed/supervised_user_authentication.cc - Issue 224343003: Enable supervised users password sync/import on ChromeOS

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/chromeos/login/managed/supervised_user_authentication.cc

Issue 224343003: Enable supervised users password sync/import on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update tests 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

« no previous file with comments | « chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc ('k') | chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

diff --git a/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc b/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

index cbfba6f2be35f157a4366564ae367755711846b5..87478c6acb23d54754afb59b29634deef0827fa3 100644

--- a/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

+++ b/chrome/browser/chromeos/login/managed/supervised_user_authentication.cc

@@ -5,7 +5,6 @@

#include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"

#include "base/base64.h"

-#include "base/command_line.h"

#include "base/json/json_file_value_serializer.h"

#include "base/macros.h"

#include "base/metrics/histogram.h"

@@ -17,7 +16,6 @@

#include "chrome/browser/chromeos/login/user.h"

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

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

-#include "chromeos/chromeos_switches.h"

#include "chromeos/cryptohome/signed_secret.pb.h"

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

#include "crypto/hmac.h"

@@ -137,11 +135,7 @@ void OnPasswordDataLoaded(

SupervisedUserAuthentication::SupervisedUserAuthentication(

SupervisedUserManager* owner)

: owner_(owner),

- stable_schema_(SCHEMA_PLAIN) {

- CommandLine* command_line = CommandLine::ForCurrentProcess();

- if (command_line->HasSwitch(switches::kEnableSupervisedPasswordSync)) {

- stable_schema_ = SCHEMA_SALT_HASHED;

- }

+ stable_schema_(SCHEMA_SALT_HASHED) {

}

SupervisedUserAuthentication::~SupervisedUserAuthentication() {}