Provide lazy CommitPendingWrites in addition to eager SavePersistentPrefs.

chrome/common/json_pref_store.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/json_pref_store.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/values.h"
 #include "chrome/common/json_value_serializer.h"
+#include "content/common/notification_service.h"
 
 namespace {
 
 // Some extensions we'll tack on to copies of the Preferences files.
 const FilePath::CharType* kBadExtension = FILE_PATH_LITERAL("bad");
 
 }  // namespace
 
 JsonPrefStore::JsonPrefStore(const FilePath& filename,
                              base::MessageLoopProxy* file_message_loop_proxy)
     : path_(filename),
       prefs_(new DictionaryValue()),
       read_only_(false),
-      writer_(filename, file_message_loop_proxy) {
+      writer_(filename, file_message_loop_proxy),
+      source_(NotificationService::AllSources()) {
 }
 
 JsonPrefStore::~JsonPrefStore() {
-  if (writer_.HasPendingWrite() && !read_only_)
-    writer_.DoScheduledWrite();
+  CommitPendingWrite();
 }
 
 PrefStore::ReadResult JsonPrefStore::GetValue(const std::string& key,
                                               Value** result) const {
   return prefs_->Get(key, result) ? READ_OK : READ_NO_VALUE;
 }
 
 void JsonPrefStore::AddObserver(PrefStore::Observer* observer) {
   observers_.AddObserver(observer);
 }
@@ skipping 111 matching lines @@
   return true;
 }
 
 void JsonPrefStore::ScheduleWritePrefs() {
   if (read_only_)
     return;
 
   writer_.ScheduleWrite(this);
 }
 
+void JsonPrefStore::CommitPendingWrite() {
+  if (writer_.HasPendingWrite() && !read_only_) {
+    writer_.DoScheduledWrite();
+  } else {
+#if defined(OS_CHROMEOS)
+    if (NotificationService::current()) {
+      NotificationService::current()->Notify(
+          NotificationType::PREF_COMMITTED,
+          source_,
+          NotificationService::NoDetails());
+    }
+#endif
+  }
+}
+
+void JsonPrefStore::SetNotificationSource(const NotificationSource& source) {
+  source_ = source;
+  writer_.set_notification_source(source);
+}
+
 void JsonPrefStore::ReportValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
 }
 
 bool JsonPrefStore::SerializeData(std::string* output) {
   // TODO(tc): Do we want to prune webkit preferences that match the default
   // value?
   JSONStringValueSerializer serializer(output);
   serializer.set_pretty_print(true);
   scoped_ptr<DictionaryValue> copy(prefs_->DeepCopyWithoutEmptyChildren());
   return serializer.Serialize(*(copy.get()));
 }