| Index: chrome/browser/sync/js/js_sync_manager_observer.cc
|
| diff --git a/chrome/browser/sync/js/js_sync_manager_observer.cc b/chrome/browser/sync/js/js_sync_manager_observer.cc
|
| index 079a53d56f3fc61123177625e9b54232782393b5..0a19ff9abf9ac8db391cd0df70d5dcd6c5265436 100644
|
| --- a/chrome/browser/sync/js/js_sync_manager_observer.cc
|
| +++ b/chrome/browser/sync/js/js_sync_manager_observer.cc
|
| @@ -81,14 +81,14 @@ void JsSyncManagerObserver::OnPassphraseAccepted(
|
| }
|
|
|
| void JsSyncManagerObserver::OnEncryptedTypesChanged(
|
| - const syncable::ModelTypeSet& encrypted_types,
|
| + syncable::ModelEnumSet encrypted_types,
|
| bool encrypt_everything) {
|
| if (!event_handler_.IsInitialized()) {
|
| return;
|
| }
|
| DictionaryValue details;
|
| details.Set("encryptedTypes",
|
| - syncable::ModelTypeSetToValue(encrypted_types));
|
| + syncable::ModelEnumSetToValue(encrypted_types));
|
| details.SetBoolean("encryptEverything", encrypt_everything);
|
| HandleJsEvent(FROM_HERE,
|
| "onEncryptedTypesChanged", JsEventDetails(&details));
|
|
|