chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc - Issue 565293003: Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.

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 565293003: Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 97b24d2138f003d6841adac7feef0a7323a313ae..804a32eb1ea6154ba56c7d47132841bf2a871b4d 100644

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

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

@@ -5,11 +5,10 @@

#include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"

#include "base/thread_task_runner_handle.h"

-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"

-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.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 "chromeos/login/login_state.h"

-#include "components/ownership/owner_key_util.h"

#include "components/user_manager/user_manager.h"

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

@@ -45,9 +44,9 @@

LoginState::LOGGED_IN_USER_NONE);

}

- OwnerSettingsServiceChromeOS::IsOwnerForSafeModeAsync(

+ OwnerSettingsService::IsOwnerForSafeModeAsync(

context.GetUserIDHash(),

- OwnerSettingsServiceChromeOSFactory::GetInstance()->GetOwnerKeyUtil(),

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

callback);

}