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 "ui/base/device_form_factor.h"
 #include "url/gurl.h"
 
-#if defined(OS_ANDROID)
-#include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
-#endif  // defined(OS_ANDROID)
-
 using content::UserMetricsAction;
 
 namespace {
 
 const int kDefaultGroupSize = 100;
 
 const char promo_server_url[] = "https://clients3.google.com/crsignal/client";
 
 // The name of the preference that stores the promotion object.
 const char kPrefPromoObject[] = "promo";
@@ skipping 11 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
-  const bool isTablet = false;
-  return std::string("ios-") + (isTablet ? "tablet" : "phone");
+  ui::DeviceFormFactor form_factor = ui::GetDeviceFormFactor();
+  return std::string("ios-") +
+      (form_factor == ui::DEVICE_FORM_FACTOR_TABLET ? "tablet" : "phone");
 #elif defined(OS_MACOSX)
   return "mac";
 #elif defined(OS_CHROMEOS)
   return "chromeos";
 #elif defined(OS_LINUX)
   return "linux";
 #elif defined(OS_ANDROID)

[Alexei Svitkine (slow), 2013/11/04 16:08:51]

Can you move this block next to OS_IOS (how about before it)?

It occurred to me that if android builds also define OS_LINUX, then this block
never gets hit. (Maybe they don't so it's correct, but better to just move this
block to be sure. Also, having it next to the iOS block makes it easier to see
that they have the same logic.)

[yao, 2013/11/04 19:38:29]

Done.

-  const bool isTablet =
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI);
-  return std::string("android-") + (isTablet ? "tablet" : "phone");
+  ui::DeviceFormFactor form_factor = ui::GetDeviceFormFactor();
+  return (std::string("android-") +

[Alexei Svitkine (slow), 2013/11/04 16:08:51]

Nit: remove ( before std::string (and at the end), so that it's consistent with
iOS case above.

[yao, 2013/11/04 19:38:29]

Done.

+      (form_factor == ui::DEVICE_FORM_FACTOR_TABLET ? "tablet" : "phone"));
 #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_;
 }