| Index: chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
|
| diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
|
| index 5b871de577142b085a17f33972367ad5850134cf..9936fa08f020e93b0eff6fe86a1dcbecc3f81db8 100644
|
| --- a/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
|
| +++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge.cc
|
| @@ -28,7 +28,7 @@ ChromeSyncNotificationBridge::ChromeSyncNotificationBridge(
|
| ChromeSyncNotificationBridge::~ChromeSyncNotificationBridge() {}
|
|
|
| void ChromeSyncNotificationBridge::UpdateEnabledTypes(
|
| - const syncable::ModelTypeSet types) {
|
| + const syncer::ModelTypeSet types) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| enabled_types_ = types;
|
| }
|
| @@ -59,14 +59,14 @@ void ChromeSyncNotificationBridge::Observe(
|
| return;
|
| }
|
|
|
| - content::Details<const syncable::ModelTypePayloadMap>
|
| + content::Details<const syncer::ModelTypePayloadMap>
|
| payload_details(details);
|
| - syncable::ModelTypePayloadMap payload_map = *(payload_details.ptr());
|
| + syncer::ModelTypePayloadMap payload_map = *(payload_details.ptr());
|
|
|
| if (payload_map.empty()) {
|
| // No model types to invalidate, invalidating all enabled types.
|
| payload_map =
|
| - syncable::ModelTypePayloadMapFromEnumSet(enabled_types_, std::string());
|
| + syncer::ModelTypePayloadMapFromEnumSet(enabled_types_, std::string());
|
| }
|
|
|
| observers_->Notify(
|
|
|