| Index: chrome/browser/sync/syncable/model_type.cc
|
| diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
|
| index 5a06be84d43d53fd87f7a1e33b421bb636c1f3f5..88cc0b3f94236790f466511949e6b2944308a82f 100644
|
| --- a/chrome/browser/sync/syncable/model_type.cc
|
| +++ b/chrome/browser/sync/syncable/model_type.cc
|
| @@ -34,6 +34,9 @@ void AddDefaultExtensionValue(syncable::ModelType datatype,
|
| case AUTOFILL:
|
| specifics->MutableExtension(sync_pb::autofill);
|
| break;
|
| + case AUTOFILL_PROFILE:
|
| + specifics->MutableExtension(sync_pb::autofill_profile);
|
| + break;
|
| case THEMES:
|
| specifics->MutableExtension(sync_pb::theme);
|
| break;
|
| @@ -101,6 +104,9 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
|
| if (specifics.HasExtension(sync_pb::autofill))
|
| return AUTOFILL;
|
|
|
| + if (specifics.HasExtension(sync_pb::autofill_profile))
|
| + return AUTOFILL_PROFILE;
|
| +
|
| if (specifics.HasExtension(sync_pb::theme))
|
| return THEMES;
|
|
|
| @@ -163,6 +169,8 @@ const char kExtensionNotificationType[] = "EXTENSION";
|
| const char kNigoriNotificationType[] = "NIGORI";
|
| const char kAppNotificationType[] = "APP";
|
| const char kSessionNotificationType[] = "SESSION";
|
| +// [TODO] talk to akalin to make sure this is what I understand this to be.
|
| +const char kAutofillProfileType[] = "AUTOFILL";
|
| // TODO(akalin): This is a hack to make new sync data types work with
|
| // server-issued notifications. Remove this when it's not needed
|
| // anymore.
|
| @@ -202,6 +210,9 @@ bool RealModelTypeToNotificationType(ModelType model_type,
|
| case SESSIONS:
|
| *notification_type = kSessionNotificationType;
|
| return true;
|
| + case AUTOFILL_PROFILE:
|
| + *notification_type = kAutofillProfileType;
|
| + return true;
|
| // TODO(akalin): This is a hack to make new sync data types work with
|
| // server-issued notifications. Remove this when it's not needed
|
| // anymore.
|
| @@ -247,8 +258,7 @@ bool NotificationTypeToRealModelType(const std::string& notification_type,
|
| } else if (notification_type == kSessionNotificationType) {
|
| *model_type = SESSIONS;
|
| return true;
|
| - }
|
| - else if (notification_type == kUnknownNotificationType) {
|
| + } else if (notification_type == kUnknownNotificationType) {
|
| // TODO(akalin): This is a hack to make new sync data types work with
|
| // server-issued notifications. Remove this when it's not needed
|
| // anymore.
|
|
|