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

Side by Side Diff: chrome/browser/sync/protocol/proto_enum_conversions.cc

Issue 9664008: Add Phone/Tablet device types for syncing session from Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: made function private Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/glue/synced_session.h ('k') | sync/protocol/session_specifics.proto » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Keep this file in sync with the .proto files in this directory. 5 // Keep this file in sync with the .proto files in this directory.
6 6
7 #include "chrome/browser/sync/protocol/proto_enum_conversions.h" 7 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NEW_CLIENT); 85 ENUM_CASE(sync_pb::GetUpdatesCallerInfo, NEW_CLIENT);
86 ENUM_CASE(sync_pb::GetUpdatesCallerInfo, RECONFIGURATION); 86 ENUM_CASE(sync_pb::GetUpdatesCallerInfo, RECONFIGURATION);
87 ENUM_CASE(sync_pb::GetUpdatesCallerInfo, DATATYPE_REFRESH); 87 ENUM_CASE(sync_pb::GetUpdatesCallerInfo, DATATYPE_REFRESH);
88 } 88 }
89 NOTREACHED(); 89 NOTREACHED();
90 return ""; 90 return "";
91 } 91 }
92 92
93 const char* GetDeviceTypeString( 93 const char* GetDeviceTypeString(
94 sync_pb::SessionHeader::DeviceType device_type) { 94 sync_pb::SessionHeader::DeviceType device_type) {
95 ASSERT_ENUM_BOUNDS(sync_pb::SessionHeader, DeviceType, TYPE_WIN, TYPE_OTHER); 95 ASSERT_ENUM_BOUNDS(sync_pb::SessionHeader, DeviceType, TYPE_WIN, TYPE_TABLET);
96 switch (device_type) { 96 switch (device_type) {
97 ENUM_CASE(sync_pb::SessionHeader, TYPE_WIN); 97 ENUM_CASE(sync_pb::SessionHeader, TYPE_WIN);
98 ENUM_CASE(sync_pb::SessionHeader, TYPE_MAC); 98 ENUM_CASE(sync_pb::SessionHeader, TYPE_MAC);
99 ENUM_CASE(sync_pb::SessionHeader, TYPE_LINUX); 99 ENUM_CASE(sync_pb::SessionHeader, TYPE_LINUX);
100 ENUM_CASE(sync_pb::SessionHeader, TYPE_CROS); 100 ENUM_CASE(sync_pb::SessionHeader, TYPE_CROS);
101 ENUM_CASE(sync_pb::SessionHeader, TYPE_OTHER); 101 ENUM_CASE(sync_pb::SessionHeader, TYPE_OTHER);
102 ENUM_CASE(sync_pb::SessionHeader, TYPE_PHONE);
103 ENUM_CASE(sync_pb::SessionHeader, TYPE_TABLET);
102 } 104 }
103 NOTREACHED(); 105 NOTREACHED();
104 return ""; 106 return "";
105 } 107 }
106 108
107 #undef ASSERT_ENUM_BOUNDS 109 #undef ASSERT_ENUM_BOUNDS
108 #undef ENUM_CASE 110 #undef ENUM_CASE
109 111
110 } // namespace 112 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/synced_session.h ('k') | sync/protocol/session_specifics.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698