Pref service: support for incognito prefs

services/preferences/pref_store_manager_impl.h

 // Copyright 2017 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.
 
 #ifndef SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_
 #define SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_
 
 #include <memory>
 #include <set>
 #include <unordered_map>
@@ skipping 37 matching lines @@
       scoped_refptr<base::SequencedWorkerPool> worker_pool);
   ~PrefStoreManagerImpl() override;
 
  private:
   struct PendingConnect;
 
   // mojom::PrefStoreRegistry:
   void Register(PrefValueStore::PrefStoreType type,
                 mojom::PrefStorePtr pref_store_ptr) override;
 
-  // mojom::PrefStoreConnector: |already_connected_types| must not include
-  // PrefValueStore::DEFAULT_STORE and PrefValueStore::USER_STORE as these must
-  // always be accessed through the service.
+  // mojom::PrefStoreConnector:
+  // |already_connected_types| must not include PrefValueStore::DEFAULT_STORE
+  // and PrefValueStore::USER_STORE as these must always be accessed through the
+  // service.
   void Connect(
       mojom::PrefRegistryPtr pref_registry,
       const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
       const ConnectCallback& callback) override;
+  void ConnectToUserPrefStore(mojom::PrefStoreRequest request) override;
 
   void BindPrefStoreConnectorRequest(
       const service_manager::BindSourceInfo& source_info,
       prefs::mojom::PrefStoreConnectorRequest request);
   void BindPrefStoreRegistryRequest(
       const service_manager::BindSourceInfo& source_info,
       prefs::mojom::PrefStoreRegistryRequest request);
   void BindPrefServiceControlRequest(
       const service_manager::BindSourceInfo& source_info,
       prefs::mojom::PrefServiceControlRequest request);
 
   // PrefServiceControl:
   void Init(mojom::PersistentPrefStoreConfigurationPtr configuration) override;
 
   // service_manager::Service:
   void OnStart() override;
   void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // Called when a PrefStore previously registered using |Register| disconnects.
   void OnPrefStoreDisconnect(PrefValueStore::PrefStoreType type);
 
   // Have all the expected PrefStores connected?
   bool AllConnected() const;
 
   void ProcessPendingConnects();
 
+  std::vector<std::string> RegisterPrefs(mojom::PrefRegistryPtr pref_registry);
+
   void ConnectImpl(
       mojom::PrefRegistryPtr pref_registry,
       const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
       const ConnectCallback& callback);
 
   void OnPersistentPrefStoreReady();
 
   // PrefStores that need to register before replying to any Connect calls. This
   // does not include the PersistentPrefStore, which is handled separately.
   std::set<PrefValueStore::PrefStoreType> expected_pref_stores_;
 
   // Registered pref stores.
   std::unordered_map<PrefValueStore::PrefStoreType, mojom::PrefStorePtr>
       pref_store_ptrs_;
 
   // We hold on to the connection request callbacks until all expected
   // PrefStores have registered.
   std::vector<PendingConnect> pending_connects_;
 
   mojo::BindingSet<mojom::PrefStoreConnector> connector_bindings_;
   mojo::BindingSet<mojom::PrefStoreRegistry> registry_bindings_;
   std::unique_ptr<PersistentPrefStoreImpl> persistent_pref_store_;
   mojo::Binding<mojom::PrefServiceControl> init_binding_;
 
+  mojom::PrefStoreConnectorPtr incognito_connector_;
+  // Read-only connections to the persistent pref store.
+  std::unique_ptr<mojo::BindingSet<mojom::PrefStore>>
+      ro_persistent_pref_store_bindings_;

[Sam McNally, 2017/05/10 01:22:16]

Don't abbreviate. Also, why is this here instead of PersistentPrefStoreImpl?

+  // Requests queued until the persistent pref store is ready.
+  std::vector<mojom::PrefStoreRequest>
+      pending_ro_persistent_pref_store_requests_;
+
   const scoped_refptr<DefaultPrefStore> defaults_;
   const std::unique_ptr<PrefStoreImpl> defaults_wrapper_;
 
   const scoped_refptr<base::SequencedWorkerPool> worker_pool_;
 
   service_manager::BinderRegistry registry_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefStoreManagerImpl);
 };
 
 }  // namespace prefs
 
 #endif  // SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_