chrome/browser/resources/settings/device_page/device_page.js - Issue 2154213008: Settings Router Refactor: Clean up Quick Unlock (and a few misc fixes)

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/settings/device_page/device_page.js

Issue 2154213008: Settings Router Refactor: Clean up Quick Unlock (and a few misc fixes) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0211-settings-router-impl-part-3-navigateTo

Patch Set: change test Created 4 years, 5 months 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/resources/settings/appearance_page/appearance_page.js ('k') | chrome/browser/resources/settings/people_page/compiled_resources2.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/device_page/device_page.js

diff --git a/chrome/browser/resources/settings/device_page/device_page.js b/chrome/browser/resources/settings/device_page/device_page.js

index faf52f76012579e539c8ab2dfcedd4f65dac5588..c416e15d41fbbd9bf275c9aea3bcb8dad1022837 100644

--- a/chrome/browser/resources/settings/device_page/device_page.js

+++ b/chrome/browser/resources/settings/device_page/device_page.js

@@ -140,21 +140,8 @@ Polymer({

checkPointerSubpage_: function() {

if (!this.hasMouse_ && !this.hasTouchpad_ &&

- this.isCurrentRouteOnPointersPage_()) {

+ this.currentRoute == settings.Route.POINTERS) {

this.$.pages.fire('subpage-back');

}

- /**

- * TODO(michaelpg): create generic fn for this and isCurrentRouteOnSyncPage_.

- * @return {boolean} Whether the current route shows the pointers page.

- * @private

- */

- isCurrentRouteOnPointersPage_: function() {

- return this.currentRoute &&

- this.currentRoute.page == 'basic' &&

- this.currentRoute.section == 'device' &&

- this.currentRoute.subpage.length == 1 &&

- this.currentRoute.subpage[0] == 'pointers';

- },

});