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

Unified Diff: chrome/browser/chromeos/locale_change_guard.cc

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. 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/locale_change_guard.cc
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc
index 6687dad3b3483daf2e82fbb083faf0a2242c6b84..fe076b4206ae1e97970f5d3b38ca481185a2f3c3 100644
--- a/chrome/browser/chromeos/locale_change_guard.cc
+++ b/chrome/browser/chromeos/locale_change_guard.cc
@@ -12,7 +12,7 @@
#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/settings/device_settings_service.h"
#include "chrome/browser/notifications/notification_delegate.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -60,7 +60,7 @@ LocaleChangeGuard::LocaleChangeGuard(Profile* profile)
note_(NULL),
reverted_(false) {
DCHECK(profile_);
- registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED,
+ registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
content::NotificationService::AllSources());
}
@@ -112,8 +112,8 @@ void LocaleChangeGuard::Observe(int type,
}
break;
}
- case chrome::NOTIFICATION_OWNERSHIP_CHECKED: {
- if (UserManager::Get()->IsCurrentUserOwner()) {
+ case chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED: {
+ if (DeviceSettingsService::Get()->HasPrivateOwnerKey()) {
PrefService* local_state = g_browser_process->local_state();
if (local_state) {
PrefService* prefs = profile_->GetPrefs();

Powered by Google App Engine
This is Rietveld 408576698