chrome/browser/resources/settings/people_page/compiled_resources2.gyp - 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/people_page/compiled_resources2.gyp

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/device_page/device_page.js ('k') | chrome/browser/resources/settings/people_page/quick_unlock_authenticate.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 32df0f78ed9b0d90b03dd73e8937523edcc7c1c5..8974fa2ad73cb7b21c0f7d39b93c2f2a063dbe22 100644

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

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

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

'target_name': 'quick_unlock_authenticate',

'dependencies': [

'../compiled_resources2.gyp:route',

- 'quick_unlock_routing_behavior',

'<(EXTERNS_GYP):quick_unlock_private',

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

@@ -107,17 +106,9 @@

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

{

- 'target_name': 'quick_unlock_routing_behavior',

- 'dependencies': [

- '../settings_page/compiled_resources2.gyp:settings_router',

- ],

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

- },

- {

'target_name': 'quick_unlock_password_detect_behavior',

'dependencies': [

'../compiled_resources2.gyp:route',

- 'quick_unlock_routing_behavior',

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

@@ -125,8 +116,8 @@

'target_name': 'quick_unlock_setup_pin',

'dependencies': [

'../compiled_resources2.gyp:route',

- 'quick_unlock_password_detect_behavior',

'../settings_page/compiled_resources2.gyp:settings_router',

+ 'quick_unlock_password_detect_behavior',

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

'<(EXTERNS_GYP):quick_unlock_private',

@@ -135,12 +126,13 @@

{

'target_name': 'sync_page',

'dependencies': [

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

+ '../settings_page/compiled_resources2.gyp:settings_animated_pages',

+ 'sync_browser_proxy',

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

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

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

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

- '../settings_page/compiled_resources2.gyp:settings_animated_pages',

- 'sync_browser_proxy',

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