chrome/browser/resources/settings/settings_page/compiled_resources2.gyp - Issue 2210933004: Settings Router Refactor: Kill settings-router.

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/settings_page/compiled_resources2.gyp

Issue 2210933004: Settings Router Refactor: Kill settings-router. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix merge Created 4 years, 4 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/settings_menu/settings_menu.js ('k') | chrome/browser/resources/settings/settings_page/main_page_behavior.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_page/compiled_resources2.gyp

diff --git a/chrome/browser/resources/settings/settings_page/compiled_resources2.gyp b/chrome/browser/resources/settings/settings_page/compiled_resources2.gyp

index 83a2fcc9a78de8fe1711d3ae1d95199f5b40bb8c..5fe9919efa1124fc0f1d4c7190f925b154a2fd75 100644

--- a/chrome/browser/resources/settings/settings_page/compiled_resources2.gyp

+++ b/chrome/browser/resources/settings/settings_page/compiled_resources2.gyp

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

{

'target_name': 'main_page_behavior',

'dependencies': [

+ '../compiled_resources2.gyp:route',

'settings_section',

'transition_behavior',

'<(EXTERNS_GYP):settings_private',

@@ -28,15 +29,6 @@

'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

{

- 'target_name': 'settings_router',

- 'dependencies': [

- '../compiled_resources2.gyp:route',

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',

- ],

- 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

- },

- {

'target_name': 'settings_section',

'dependencies': [

'<(EXTERNS_GYP):web_animations',