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

Unified Diff: sync/protocol/proto_enum_conversions.cc

Issue 10985008: sync: Add DeviceInfo protobuf and supporting code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update proto_value_conversions.cc Created 8 years, 3 months 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: sync/protocol/proto_enum_conversions.cc
diff --git a/sync/protocol/proto_enum_conversions.cc b/sync/protocol/proto_enum_conversions.cc
index 1d0ec191a6b4d05f8c99456dfc4a9ac6988d6c33..6db81c74d9f82b29c7a995f0d52adcf2eadd7b22 100644
--- a/sync/protocol/proto_enum_conversions.cc
+++ b/sync/protocol/proto_enum_conversions.cc
@@ -139,16 +139,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 "";

Powered by Google App Engine
This is Rietveld 408576698