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

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

Issue 8815015: Fix a signed settings serialization issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed the nit. I will commit it if trybots are happy. Created 9 years 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/session_manager_observer.cc
diff --git a/chrome/browser/chromeos/login/session_manager_observer.cc b/chrome/browser/chromeos/login/session_manager_observer.cc
index bd778ee85642d6437d9cc7221089c4991c827b96..d981ace9c25e108de8f1ca3d19a769220edfe1a7 100644
--- a/chrome/browser/chromeos/login/session_manager_observer.cc
+++ b/chrome/browser/chromeos/login/session_manager_observer.cc
@@ -53,19 +53,18 @@ void SessionManagerObserver::OwnerKeySet(bool success) {
if (!success)
result = chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_FAILED;
+ // We stored some settings in transient storage before owner was assigned.
+ // Now owner is assigned and key is generated and we should persist
+ // those settings into signed storage.
+ if (success && g_browser_process && g_browser_process->local_state())
+ signed_settings_cache::Finalize(g_browser_process->local_state());
+
// Whether we exported the public key or not, send a notification
// indicating that we're done with this attempt.
content::NotificationService::current()->Notify(
result,
content::NotificationService::AllSources(),
content::NotificationService::NoDetails());
-
- // We stored some settings in transient storage before owner was assigned.
- // Now owner is assigned and key is generated and we should persist
- // those settings into signed storage.
- if (g_browser_process && g_browser_process->local_state()) {
- signed_settings_cache::Finalize(g_browser_process->local_state());
- }
}
void SessionManagerObserver::PropertyChangeComplete(bool success) {
« no previous file with comments | « chrome/browser/chromeos/device_settings_provider.cc ('k') | chrome/browser/chromeos/login/signed_settings_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698