Mojom interface for Preferences

services/preferences/public/cpp/pref_observer_store.cc

Index: services/preferences/public/cpp/pref_observer_store.cc
diff --git a/services/preferences/public/cpp/pref_observer_store.cc b/services/preferences/public/cpp/pref_observer_store.cc
new file mode 100644
index 0000000000000000000000000000000000000000..50331a488f12debb6b487ac6ef71f21064dd9796
--- /dev/null
+++ b/services/preferences/public/cpp/pref_observer_store.cc
@@ -0,0 +1,97 @@
+// Copyright 2016 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 "services/preferences/public/cpp/pref_observer_store.h"
+
+#include "base/values.h"
+#include "mojo/common/common_custom_types.mojom.h"
+#include "mojo/public/cpp/bindings/array.h"
+#include "services/service_manager/public/cpp/connector.h"
+
+PrefObserverStore::PrefObserverStore(
+    prefs::mojom::PreferencesManagerPtr prefs_manager_ptr)
+    : prefs_binding_(this),
+      prefs_manager_ptr_(std::move(prefs_manager_ptr)),
+      initialized_(false) {}
+
+void PrefObserverStore::Init(const std::set<std::string>& keys) {
+  DCHECK(!initialized_);
+  keys_ = keys;
+
+  std::vector<std::string> pref_array;
+  std::copy(keys_.begin(), keys_.end(), std::back_inserter(pref_array));
+  prefs_manager_ptr_->AddObserver(std::move(pref_array),

[dcheng, 2016/10/31 19:42:46]

Does this std::move() have an effect? I think the generated stub will take this
argument by const ref.

Also, I think mojo already has array traits that allow the array to be populated
from a set, so maybe this isn't even needed.

[jonross, 2016/11/01 15:53:03]

The move is unnecessary, and removed.

For mojo, there are array traits for sets. However that does not seem to be
compiled in for methods.

AddObserver(array<string> preferences, PreferencesObserver client);
  is converted to
virtual void AddObserver(const std::vector<std::string>& preferences,
PreferencesObserverPtr client) = 0;

+                                  prefs_binding_.CreateInterfacePtrAndBind());
+}
+
+bool PrefObserverStore::GetValue(const std::string& key,
+                                 const base::Value** value) const {
+  DCHECK(initialized_);
+  DCHECK(keys_.find(key) != keys_.end());
+
+  return ValueMapPrefStore::GetValue(key, value);
+}
+
+void PrefObserverStore::SetValue(const std::string& key,
+                                 std::unique_ptr<base::Value> value,
+                                 uint32_t flags) {
+  DCHECK(keys_.find(key) != keys_.end());
+
+  // TODO(jonross): only notify the server if the value changed.
+  SetValueOnPreferenceManager(key, value.get());
+  ValueMapPrefStore::SetValue(key, std::move(value), flags);
+}
+
+void PrefObserverStore::RemoveValue(const std::string& key, uint32_t flags) {
+  // TODO(jonross): add preference removal to preferences.mojom
+  NOTIMPLEMENTED();
+}
+
+bool PrefObserverStore::GetMutableValue(const std::string& key,
+                                        base::Value** value) {
+  DCHECK(initialized_);
+  DCHECK(keys_.find(key) != keys_.end());
+
+  return ValueMapPrefStore::GetMutableValue(key, value);
+}
+
+void PrefObserverStore::ReportValueChanged(const std::string& key,
+                                           uint32_t flags) {
+  ValueMapPrefStore::ReportValueChanged(key, flags);
+}
+
+void PrefObserverStore::SetValueSilently(const std::string& key,
+                                         std::unique_ptr<base::Value> value,
+                                         uint32_t flags) {
+  SetValueOnPreferenceManager(key, value.get());
+  ValueMapPrefStore::SetValueSilently(key, std::move(value), flags);
+}
+
+PrefObserverStore::~PrefObserverStore() {}
+
+void PrefObserverStore::SetValueOnPreferenceManager(const std::string& key,
+                                                    base::Value* value) {
+  if (keys_.find(key) == keys_.end())
+    return;
+
+  base::DictionaryValue prefs;
+  prefs.Set(key, value->CreateDeepCopy());
+  prefs_manager_ptr_->SetPreferences(prefs);
+}
+
+void PrefObserverStore::OnPreferencesChanged(
+    const base::DictionaryValue& preferences) {
+  for (base::DictionaryValue::Iterator it(preferences); !it.IsAtEnd();
+       it.Advance()) {
+    if (keys_.find(it.key()) == keys_.end())
+      continue;
+    // We deliberately call the parent to avoid notifying the server again.
+    ValueMapPrefStore::SetValue(it.key(), it.value().CreateDeepCopy(), 0);
+  }
+
+  if (!initialized_) {
+    initialized_ = true;
+    NotifyInitializationCompleted();
+  }
+}