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

chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
+#include "ui/base/device_form_factor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 
 using chrome::VersionInfo;
 using content::BrowserThread;
 
 namespace {
 
@@ skipping 93 matching lines @@
       l10n_util::GetStringUTF16(IDS_NEW_TAB_BOOKMARKS_TITLE));
   localized_strings.SetString("open_tabs_document_title",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_OTHER_SESSIONS_TITLE));
 
   webui::SetFontAndTextDirection(&localized_strings);
 
   base::StringPiece new_tab_html(ResourceBundle::GetSharedInstance().
                                  GetRawDataResource(IDR_NEW_TAB_ANDROID_HTML));
   localized_strings.SetString(
       "device",
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kTabletUI) ?
+      ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET ?
           "tablet" : "phone");
 
   bool bookmark_shortcuts_allowed = false;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableAddToHomescreen)) {
     bookmark_shortcuts_allowed = true;
   } else if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableAddToHomescreen)) {
     bookmark_shortcuts_allowed = false;
   } else if (VersionInfo::GetChannel() == VersionInfo::CHANNEL_STABLE) {
@@ skipping 28 matching lines @@
     size_t after_offset = pos + template_data_placeholder.size();
     full_html.append(new_tab_html.data() + after_offset,
                      new_tab_html.size() - after_offset);
   } else {
     NOTREACHED();
     full_html.assign(new_tab_html.data(), new_tab_html.size());
   }
 
   new_tab_html_ = base::RefCountedString::TakeString(&full_html);
 }