chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc - Issue 50603005: Add cross-platform API to get the form factor of the device

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc

Issue 50603005: Add cross-platform API to get the form factor of the device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: make functions under namespace ui Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/glue/device_info.cc ('k') | chrome/browser/web_resource/notification_promo.cc » ('j') | chrome/browser/web_resource/notification_promo.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc

diff --git a/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc b/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc

index 6a1affccfb4ef8e2998b3a9f2911113581d7e612..fec28cfbead7526d9dae225fe5f74686e062f73c 100644

--- a/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc

+++ b/chrome/browser/ui/webui/ntp/android/ntp_resource_cache_android.cc

@@ -19,6 +19,7 @@

#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"

@@ -132,7 +133,7 @@ void NTPResourceCache::CreateNewTabHTML() {

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;