chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc - Issue 516243002: Instantiation of OwnerKeyUtil is delegated to OwnerSettingsServiceFactory.

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/auth/chrome_cryptohome_authenticator.cc

Issue 516243002: Instantiation of OwnerKeyUtil is delegated to OwnerSettingsServiceFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed empty ownership_test_support target. Created 6 years, 3 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/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc

diff --git a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc

index ac7694a0adf5a4a63276651c4d3787140a472e45..e2d2ed2cfd7a78ab077dfb016c5cff85cbb4b91b 100644

--- a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc

+++ b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc

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

#include "base/thread_task_runner_handle.h"

#include "chrome/browser/chromeos/ownership/owner_settings_service.h"

+#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"

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

#include "components/user_manager/user_manager.h"

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

@@ -43,7 +44,10 @@ void ChromeCryptohomeAuthenticator::CheckSafeModeOwnership(

}

OwnerSettingsService::IsOwnerForSafeModeAsync(

- context.GetUserID(), context.GetUserIDHash(), callback);

+ context.GetUserID(),

+ context.GetUserIDHash(),

+ OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil(),

+ callback);

}

} // namespace chromeos