Implementation of the DeviceInfo get API.

chrome/browser/sync/glue/device_info.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/device_info.h"
 
 #include "base/command_line.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/common/chrome_version_info.h"
@@ skipping 26 matching lines @@
       return "stable";
     default:
       NOTREACHED();
       return "unknown";
   };
 }
 
 std::string DeviceTypeToString(sync_pb::SyncEnums::DeviceType device_type) {
   switch (device_type) {
     case sync_pb::SyncEnums_DeviceType_TYPE_WIN:
-      return "WIN";
     case sync_pb::SyncEnums_DeviceType_TYPE_MAC:
-      return "MAC";
     case sync_pb::SyncEnums_DeviceType_TYPE_LINUX:
-      return "LINUX";
     case sync_pb::SyncEnums_DeviceType_TYPE_CROS:
-      return "CHROME OS";
-    case sync_pb::SyncEnums_DeviceType_TYPE_OTHER:
-      return "OTHER";
+      return "desktop_or_laptop";
     case sync_pb::SyncEnums_DeviceType_TYPE_PHONE:
-      return "PHONE";
+      return "phone";
     case sync_pb::SyncEnums_DeviceType_TYPE_TABLET:
-      return "TABLET";
+      return "tablet";
     default:
-      NOTREACHED();
-      return "UNKNOWN";
+      return "unknown";
   }
 }
 
+std::string GetOS(sync_pb::SyncEnums::DeviceType device_type) {
+  switch (device_type) {
+    case sync_pb::SyncEnums_DeviceType_TYPE_WIN:
+      return "win";
+    case sync_pb::SyncEnums_DeviceType_TYPE_MAC:
+      return "mac";
+    case sync_pb::SyncEnums_DeviceType_TYPE_LINUX:
+      return "linux";
+    case sync_pb::SyncEnums_DeviceType_TYPE_CROS:
+      return "chrome_os";
+    case sync_pb::SyncEnums_DeviceType_TYPE_PHONE:
+    case sync_pb::SyncEnums_DeviceType_TYPE_TABLET:
+      // TODO(lipalani): Add support for ios phones and tablets.

[Nicolas Zea, 2013/08/10 00:49:20]

nit: mention the bug tracking this work as well.

[lipalani1, 2013/08/13 22:42:37]

Done.

+      return "android";
+    default:
+      return "unknown";
+  }
+}
+
 }  // namespace
 
 DeviceInfo::DeviceInfo(const std::string& guid,
                        const std::string& client_name,
                        const std::string& chrome_version,
                        const std::string& sync_user_agent,
                        const sync_pb::SyncEnums::DeviceType device_type)
     : guid_(guid),
       client_name_(client_name),
       chrome_version_(chrome_version),
@@ skipping 89 matching lines @@
   } else {
     user_agent += " channel(" +
         ChannelToString(version_info.GetChannel()) + ")";
   }
 
   return user_agent;
 }
 
 base::DictionaryValue* DeviceInfo::ToValue() {
   base::DictionaryValue* value = new base::DictionaryValue();
-  value->SetString("Id", public_id_);
-  value->SetString("Client Name", client_name_);
-  value->SetString("Chrome Version", chrome_version_);
-  value->SetString("Sync User Agent", sync_user_agent_);
+  value->SetString("id", public_id_);
+  value->SetString("name", client_name_);
+  value->SetString("chromeVersion", chrome_version_);
+  value->SetString("OS", GetOS(device_type_));

[Matt Perry, 2013/08/12 22:21:01]

lowercase "os" (notice "id" is lowercase)

[lipalani1, 2013/08/13 22:42:37]

Done.

   value->SetString("Device Type", DeviceTypeToString(device_type_));
   return value;
 }
 
 void DeviceInfo::set_public_id(std::string id) {
   public_id_ = id;
 }
 
 // static.
 void DeviceInfo::CreateLocalDeviceInfo(
@@ skipping 31 matching lines @@
       guid,
       session_name,
       version_info.CreateVersionString(),
       MakeUserAgentForSyncApi(version_info),
       GetLocalDeviceType());
 
   callback.Run(local_info);
 }
 
 }  // namespace browser_sync