Add cross-platform API to get the form factor of the device

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"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/util/get_session_name.h"
 
+#if defined(OS_ANDROID)

[Alexei Svitkine (slow), 2013/10/31 14:52:32]

No need for the ifdef here, just add this include together with the rest. (Even
if the function is only used for android, the include won't be an issue for
other platforms).

[yao, 2013/11/01 14:37:59]

Done.

+#include "chrome/common/device_form_factor.h"
+#endif
+
 namespace browser_sync {
 
 namespace {
 
 #if defined(OS_ANDROID)
 bool IsTabletUI() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI);
+  return GetDeviceFormFactor() == DEVICE_FORM_FACTOR_TABLET;
 }
 #endif
 
 // Converts VersionInfo::Channel to string for user-agent string.
 std::string ChannelToString(chrome::VersionInfo::Channel channel) {
   switch (channel) {
     case chrome::VersionInfo::CHANNEL_UNKNOWN:
       return "unknown";
     case chrome::VersionInfo::CHANNEL_CANARY:
       return "canary";
@@ skipping 202 matching lines @@
       guid,
       session_name,
       version_info.CreateVersionString(),
       MakeUserAgentForSyncApi(version_info),
       GetLocalDeviceType());
 
   callback.Run(local_info);
 }
 
 }  // namespace browser_sync