Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: chrome/browser/chromeos/login/base_login_display_host.cc

Issue 10918027: Revert 154457 - Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
Index: chrome/browser/chromeos/login/base_login_display_host.cc
===================================================================
--- chrome/browser/chromeos/login/base_login_display_host.cc (revision 154482)
+++ chrome/browser/chromeos/login/base_login_display_host.cc (working copy)
@@ -262,7 +262,7 @@
// Start by checking if the device has already been owned.
pointer_factory_.InvalidateWeakPtrs();
- DeviceSettingsService::Get()->GetOwnershipStatusAsync(
+ OwnershipService::GetSharedInstance()->GetStatusAsync(
base::Bind(&BaseLoginDisplayHost::OnOwnershipStatusCheckDone,
pointer_factory_.GetWeakPtr()));
}
@@ -407,9 +407,9 @@
}
void BaseLoginDisplayHost::OnOwnershipStatusCheckDone(
- DeviceSettingsService::OwnershipStatus status,
+ OwnershipService::Status status,
bool current_user_is_owner) {
- if (status != DeviceSettingsService::OWNERSHIP_NONE) {
+ if (status != OwnershipService::OWNERSHIP_NONE) {
// The device is already owned. No need for auto-enrollment checks.
VLOG(1) << "CheckForAutoEnrollment: device already owned";
return;
« no previous file with comments | « chrome/browser/chromeos/login/base_login_display_host.h ('k') | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698