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

chrome/browser/web_resource/notification_promo.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/web_resource/notification_promo.h"
 
 #include <cmath>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/user_metrics.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
 #if defined(OS_ANDROID)

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

Same comment as for device_info.cc.

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

Done.

-#include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/common/device_form_factor.h"
 #endif  // defined(OS_ANDROID)
 
 using content::UserMetricsAction;
 
 namespace {
 
 const int kDefaultGroupSize = 100;
 
 const char promo_server_url[] = "https://clients3.google.com/crsignal/client";
 
@@ skipping 13 matching lines @@
 const char kPrefPromoMaxViews[] = "max_views";
 const char kPrefPromoGroup[] = "group";
 const char kPrefPromoViews[] = "views";
 const char kPrefPromoClosed[] = "closed";
 
 // Returns a string suitable for the Promo Server URL 'osname' value.
 std::string PlatformString() {
 #if defined(OS_WIN)
   return "win";
 #elif defined(OS_IOS)
   // TODO(noyau): add iOS-specific implementation

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

Nit: Address this TODO using the new API.

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

Done.

   const bool isTablet = false;
   return std::string("ios-") + (isTablet ? "tablet" : "phone");
 #elif defined(OS_MACOSX)
   return "mac";
 #elif defined(OS_CHROMEOS)
   return "chromeos";
 #elif defined(OS_LINUX)
   return "linux";
 #elif defined(OS_ANDROID)
-  const bool isTablet =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI);
-  return std::string("android-") + (isTablet ? "tablet" : "phone");
+  DeviceFormFactor device = GetDeviceFormFactor();

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

Nit: remove to |form_factor|.

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

Done.

+  return (std::string("android-") +
+          (device == DEVICE_FORM_FACTOR_TABLET? "tablet" : "phone"));

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

Nit: Space before ?

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

Done.

 #else
   return "none";
 #endif
 }
 
 // Returns a string suitable for the Promo Server URL 'dist' value.
 const char* ChannelString() {
 #if defined (OS_WIN)
   // GetChannel hits the registry on Windows. See http://crbug.com/70898.
   // TODO(achuith): Move NotificationPromo::PromoServerURL to the blocking pool.
@@ skipping 376 matching lines @@
   if (group_ < initial_segment_)
     return start_;
   return start_ +
       std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_)
       * time_slice_;
 }
 
 double NotificationPromo::EndTime() const {
   return end_;
 }