diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 13:25:38 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 13:25:38 +0000 |
| commit | 7dd20e4f00adb47225ad9df20b799abcf215a090 (patch) | |
| tree | 6312148b0f4044e00a908de0e25c33f4866e8666 | |
| parent | 9297259fa3a04001d23ce1648b4d4c96d4848756 (diff) | |
| download | chromium_src-7dd20e4f00adb47225ad9df20b799abcf215a090.zip chromium_src-7dd20e4f00adb47225ad9df20b799abcf215a090.tar.gz chromium_src-7dd20e4f00adb47225ad9df20b799abcf215a090.tar.bz2 | |
Fix the ownership check for signed settings.
The check was trying to verify the current user is the owner when all it
needs to check is if there is an owner already.
This check was also blocking local owner from doing changes to the signed
settings on first login and possibly is the cause preventing the managed
settings from getting applied immediately too.
BUG=chromium-os:24020,chromium-os:24007
TEST=As described in the bugs.
Review URL: http://codereview.chromium.org/8921007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114212 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/device_settings_provider.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/device_settings_provider.cc b/chrome/browser/chromeos/device_settings_provider.cc index 15037a3..0557831 100644 --- a/chrome/browser/chromeos/device_settings_provider.cc +++ b/chrome/browser/chromeos/device_settings_provider.cc @@ -144,10 +144,8 @@ void DeviceSettingsProvider::Observe( int type, const content::NotificationSource& source, const content::NotificationDetails& details) { - if (type == chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED && - UserManager::Get()->current_user_is_owner()) { - // Reload the initial policy blob, apply settings from temp storage, - // and write back the blob. + if (type == chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED) { + // Reload the policy blob once the owner key has been loaded or updated. ownership_status_ = OwnershipService::OWNERSHIP_TAKEN; Reload(); } |