chrome/browser/resources/shared/js/cr.js - Issue 8695007: Replace TOUCH_UI condition in WebUI with dynamic flag.

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/resources/shared/js/cr.js

Issue 8695007: Replace TOUCH_UI condition in WebUI with dynamic flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Tiny tweaks based on CR feedback Created 9 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

Index: chrome/browser/resources/shared/js/cr.js

diff --git a/chrome/browser/resources/shared/js/cr.js b/chrome/browser/resources/shared/js/cr.js

index fb47a8aae9dacca9838f1a5dcc729ea7eaccddb7..d9479f9e9c43b246b1689103d92c762f75e0b893 100644

--- a/chrome/browser/resources/shared/js/cr.js

+++ b/chrome/browser/resources/shared/js/cr.js

@@ -23,12 +23,6 @@ const cr = (function() {

const isChromeOS = /CrOS/.test(navigator.userAgent);

/**

- * Whether this is on touchui build or not.

- * @type {boolean}

- */

- const isTouch = /Touch/.test(navigator.userAgent);

- /**

* Whether this is on vanilla Linux (not chromeOS).

* @type {boolean}

@@ -47,6 +41,12 @@ const cr = (function() {

const isViews = /views/.test(chrome.toolkit);

/**

+ * Whether this window is optimized for touch-based input.

+ * @type {boolean}

+ */

+ const isTouchOptimized = !!chrome.touchOptimized;

+ /**

* Sets the os and toolkit attributes in the <html> element so that platform

* specific css rules can be applied.

@@ -63,6 +63,8 @@ const cr = (function() {

doc.documentElement.setAttribute('toolkit', 'gtk');

if (isViews)

doc.documentElement.setAttribute('toolkit', 'views');

+ if (isTouchOptimized)

+ doc.documentElement.setAttribute('touch-optimized', '');

}

/**

@@ -372,7 +374,7 @@ const cr = (function() {

isWindows: isWindows,

isLinux: isLinux,

isViews: isViews,

- isTouch: isTouch,

+ isTouchOptimized: isTouchOptimized,

enablePlatformSpecificCSSRules: enablePlatformSpecificCSSRules,

define: define,

defineProperty: defineProperty,

« no previous file with comments | « chrome/browser/resources/options/options_page.css ('k') | chrome/browser/resources/shared/js/cr/ui/card_slider.js » ('j') | no next file with comments »