chrome/browser/chromeos/login/managed/managed_user_authenticator.cc - Issue 378513005: [Athena] Extract Chrome OS authentication stack

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/managed_user_authenticator.cc

Issue 378513005: [Athena] Extract Chrome OS authentication stack (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix includes in one more test Created 6 years, 5 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/managed_user_creation_controller_new.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 515479f4ab1e9ab1501fca0138ce57ada865a6aa..feae73bc832a3e9188d78631fc1da15429a3ab8d 100644

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

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

@@ -8,12 +8,12 @@

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

#include "chrome/browser/chromeos/boot_times_loader.h"

-#include "chrome/browser/chromeos/login/auth/key.h"

#include "chromeos/cryptohome/async_method_caller.h"

#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/cryptohome/system_salt_getter.h"

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_thread_manager.h"

+#include "chromeos/login/auth/key.h"

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

#include "crypto/sha2.h"

#include "google_apis/gaia/gaia_auth_util.h"