diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 23:41:32 +0000 |
| commit | a4a1476522880f416690e9357eedaa40b5ac8a99 (patch) | |
| tree | bc2a8cc0a4942e16094f9a07859508583b03e169 /sync/internal_api/js_sync_manager_observer.cc | |
| parent | dade34b60910f213ae8f8fdd13709ec17581ef9e (diff) | |
| download | chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.zip chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.gz chromium_src-a4a1476522880f416690e9357eedaa40b5ac8a99.tar.bz2 | |
[Sync] Move ModelType and related classes to 'syncer' namespace
Previously they were in 'syncer::syncable'.
Also remove aliases to those classes from 'syncable'.
BUG=128060
TEST=
TBR=pkasting@chromium.org,jhawkins@chromium.org,
Review URL: https://chromiumcodereview.appspot.com/10696087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/js_sync_manager_observer.cc')
| -rw-r--r-- | sync/internal_api/js_sync_manager_observer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/internal_api/js_sync_manager_observer.cc b/sync/internal_api/js_sync_manager_observer.cc index 8a9889b..4bad2e0 100644 --- a/sync/internal_api/js_sync_manager_observer.cc +++ b/sync/internal_api/js_sync_manager_observer.cc @@ -92,14 +92,14 @@ void JsSyncManagerObserver::OnBootstrapTokenUpdated( } void JsSyncManagerObserver::OnEncryptedTypesChanged( - syncable::ModelTypeSet encrypted_types, + syncer::ModelTypeSet encrypted_types, bool encrypt_everything) { if (!event_handler_.IsInitialized()) { return; } DictionaryValue details; details.Set("encryptedTypes", - syncable::ModelTypeSetToValue(encrypted_types)); + syncer::ModelTypeSetToValue(encrypted_types)); details.SetBoolean("encryptEverything", encrypt_everything); HandleJsEvent(FROM_HERE, "onEncryptedTypesChanged", JsEventDetails(&details)); |