| Index: sync/protocol/proto_enum_conversions.cc
|
| diff --git a/sync/protocol/proto_enum_conversions.cc b/sync/protocol/proto_enum_conversions.cc
|
| index 42d8ab54530f8ffeb13dbd1bfc2f9d5bfa69326c..267790c94de796666c3d2b544533a8c87c85b6ba 100644
|
| --- a/sync/protocol/proto_enum_conversions.cc
|
| +++ b/sync/protocol/proto_enum_conversions.cc
|
| @@ -141,16 +141,16 @@ const char* GetActionString(sync_pb::SyncEnums::Action action) {
|
| }
|
|
|
| const char* GetDeviceTypeString(
|
| - sync_pb::SessionHeader::DeviceType device_type) {
|
| - ASSERT_ENUM_BOUNDS(sync_pb::SessionHeader, DeviceType, TYPE_WIN, TYPE_TABLET);
|
| + sync_pb::SyncEnums::DeviceType device_type) {
|
| + ASSERT_ENUM_BOUNDS(sync_pb::SyncEnums, DeviceType, TYPE_WIN, TYPE_TABLET);
|
| switch (device_type) {
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_WIN);
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_MAC);
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_LINUX);
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_CROS);
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_OTHER);
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_PHONE);
|
| - ENUM_CASE(sync_pb::SessionHeader, TYPE_TABLET);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_WIN);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_MAC);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_LINUX);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_CROS);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_OTHER);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_PHONE);
|
| + ENUM_CASE(sync_pb::SyncEnums, TYPE_TABLET);
|
| }
|
| NOTREACHED();
|
| return "";
|
|
|