diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 19:45:58 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 19:45:58 +0000 |
| commit | 1efe63c885b492499347012308392abfc2a3ad09 (patch) | |
| tree | 721062dc820f601e5cd665230ebd232f0a9a79bd /chrome/browser/chromeos/locale_change_guard.cc | |
| parent | 9a9e90b57da5f150551373e9c777da72fd414c57 (diff) | |
| download | chromium_src-1efe63c885b492499347012308392abfc2a3ad09.zip chromium_src-1efe63c885b492499347012308392abfc2a3ad09.tar.gz chromium_src-1efe63c885b492499347012308392abfc2a3ad09.tar.bz2 | |
Revert 154457 - Switch from SignedSettings to DeviceSettingsService.
This broke GoogleUpdateTest.StatsConsent on Linux ChromiumOS bots.
Check the try jobs from the original code review - the same test failed
on the Linux ChromeOS Valgrind bot.
DevicePolicyCache and DeviceSettingsProvider now go through
DeviceSettingsService, which provides a unified and simpler API to
Chrome OS device settings.
BUG=chromium:139126
TEST=Unit tests, everything related to enterprise enrollment and device settings still works.
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10832035
TBR=mnissler@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10918027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/locale_change_guard.cc')
| -rw-r--r-- | chrome/browser/chromeos/locale_change_guard.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc index fe076b4..6687dad 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/settings/device_settings_service.h" +#include "chrome/browser/chromeos/login/user_manager.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_STATUS_CHANGED, + registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED, content::NotificationService::AllSources()); } @@ -112,8 +112,8 @@ void LocaleChangeGuard::Observe(int type, } break; } - case chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED: { - if (DeviceSettingsService::Get()->HasPrivateOwnerKey()) { + case chrome::NOTIFICATION_OWNERSHIP_CHECKED: { + if (UserManager::Get()->IsCurrentUserOwner()) { PrefService* local_state = g_browser_process->local_state(); if (local_state) { PrefService* prefs = profile_->GetPrefs(); |