| Index: components/wifi_sync/wifi_credential_syncable_service_impl.h
|
| diff --git a/components/wifi_sync/wifi_credential_syncable_service_impl.h b/components/wifi_sync/wifi_credential_syncable_service_impl.h
|
| index 186efb51ee6018605a9d005db88a04a80aff5264..dc01bf99959f749be9f6804adac302436db062d1 100644
|
| --- a/components/wifi_sync/wifi_credential_syncable_service_impl.h
|
| +++ b/components/wifi_sync/wifi_credential_syncable_service_impl.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "components/wifi_sync/wifi_config_delegate.h"
|
| +#include "components/wifi_sync/wifi_config_observer.h"
|
| #include "components/wifi_sync/wifi_credential.h"
|
| #include "components/wifi_sync/wifi_security_class.h"
|
| #include "sync/api/sync_change_processor.h"
|
| @@ -33,8 +34,9 @@ class WifiCredentialSyncableServiceImpl
|
| // applied locally by |network_config_delegate|. Local changes will
|
| // be propagated to Chrome Sync using the |sync_processor| provided
|
| // in the call to MergeDataAndStartSyncing.
|
| - explicit WifiCredentialSyncableServiceImpl(
|
| - scoped_ptr<WifiConfigDelegate> network_config_delegate);
|
| + WifiCredentialSyncableServiceImpl(
|
| + scoped_ptr<WifiConfigDelegate> network_config_delegate,
|
| + scoped_ptr<WifiConfigObserver> network_config_observer);
|
| ~WifiCredentialSyncableServiceImpl() override;
|
|
|
| // syncer::SyncableService implementation.
|
| @@ -50,8 +52,7 @@ class WifiCredentialSyncableServiceImpl
|
| const syncer::SyncChangeList& change_list) override;
|
|
|
| // WifiCredentialSyncableService implementation.
|
| - bool AddToSyncedNetworks(const std::string& item_id,
|
| - const WifiCredential& credential) override;
|
| + bool AddToSyncedNetworks(const WifiCredential& credential) override;
|
|
|
| private:
|
| using SsidAndSecurityClass =
|
| @@ -66,6 +67,10 @@ class WifiCredentialSyncableServiceImpl
|
| // The object we use to change local network configuration.
|
| const scoped_ptr<WifiConfigDelegate> network_config_delegate_;
|
|
|
| + // The object that informs us about changes to local network
|
| + // configuration.
|
| + const scoped_ptr<WifiConfigObserver> network_config_observer_;
|
| +
|
| // Our SyncChangeProcessor instance. Used to push changes into
|
| // Chrome Sync.
|
| scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
|
|
|