chrome/browser/resources/settings/site_settings/site_list.js - Issue 2156413002: Settings Router Refactor: Migrate to settings.Route.navigateTo calls.

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/site_settings/site_list.js

Issue 2156413002: Settings Router Refactor: Migrate to settings.Route.navigateTo calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix chromeos tests 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

« chrome/browser/resources/settings/settings_page/settings_router.js ('K') | « chrome/browser/resources/settings/site_settings/compiled_resources2.gyp ('k') | chrome/browser/resources/settings/site_settings/site_settings_behavior.html » ('j') | chrome/test/data/webui/settings/device_page_tests.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings/site_list.js

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

index 3020f519716a74a72d8ff935112a28ccc1f6b276..20d9bfc4826fe7f679546c2e4f98733106239838 100644

--- a/chrome/browser/resources/settings/site_settings/site_list.js

+++ b/chrome/browser/resources/settings/site_settings/site_list.js

@@ -382,15 +382,10 @@ Polymer({

onOriginTap_: function(event) {

this.selectedSite = event.model.item;

- var categorySelected =

- this.allSites ?

- 'all-sites' :

- 'site-settings-category-' + this.computeCategoryTextId(this.category);

- this.currentRoute = {

- page: this.currentRoute.page,

- section: 'privacy',

- subpage: ['site-settings', categorySelected, 'site-details'],

- };

+ if (this.allSites)

+ settings.navigateTo(settings.Route.SITE_SETTINGS_ALL_DETAILS);

+ else

+ settings.navigateTo(this.computeCategoryDetailsRoute(this.category));

/**