| Index: chrome/browser/sync/js/js_sync_manager_observer.h
|
| diff --git a/chrome/browser/sync/js/js_sync_manager_observer.h b/chrome/browser/sync/js/js_sync_manager_observer.h
|
| index 6d891c4c8cc185fb9ccc9d5da0885d2e3c67b7ef..6a848f79679122ff4998266ab165f6bd98e11ae0 100644
|
| --- a/chrome/browser/sync/js/js_sync_manager_observer.h
|
| +++ b/chrome/browser/sync/js/js_sync_manager_observer.h
|
| @@ -41,7 +41,7 @@ class JsSyncManagerObserver : public sync_api::SyncManager::Observer {
|
| virtual void OnPassphraseAccepted(
|
| const std::string& bootstrap_token) OVERRIDE;
|
| virtual void OnEncryptedTypesChanged(
|
| - const syncable::ModelTypeSet& encrypted_types,
|
| + syncable::ModelEnumSet encrypted_types,
|
| bool encrypt_everything) OVERRIDE;
|
| virtual void OnEncryptionComplete() OVERRIDE;
|
| virtual void OnInitializationComplete(
|
|
|