| 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 6a848f79679122ff4998266ab165f6bd98e11ae0..18ef9059f9522cc74c8670e2aabf8648879f06ad 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(
|
| - syncable::ModelEnumSet encrypted_types,
|
| + syncable::ModelTypeSet encrypted_types,
|
| bool encrypt_everything) OVERRIDE;
|
| virtual void OnEncryptionComplete() OVERRIDE;
|
| virtual void OnInitializationComplete(
|
|
|