Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6309)

Unified Diff: chrome/browser/sync/js/js_sync_manager_observer.cc

Issue 8851006: [Sync] Replace all instances of ModelTypeSet with ModelEnumSet (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup pass #2 Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
« no previous file with comments | « chrome/browser/sync/js/js_sync_manager_observer.h ('k') | chrome/browser/sync/js/js_sync_manager_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698