Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7427)

Unified Diff: chrome/browser/resources/settings/people_page/compiled_resources2.gyp

Issue 2208473007: Rework quick unlock settings to follow new specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Fix closure (bad 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/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/lock_screen.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 3b5f2156e44876b6ddfa5cdb28dc1fa22c5abc18..3f68188eb4297fbf0764c94e5c5ae484e809645b 100644
--- a/chrome/browser/resources/settings/people_page/compiled_resources2.gyp
+++ b/chrome/browser/resources/settings/people_page/compiled_resources2.gyp
@@ -66,15 +66,25 @@
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
+ 'target_name': 'password_prompt_dialog',
+ 'dependencies': [
+ '../compiled_resources2.gyp:route',
+ '<(EXTERNS_GYP):quick_unlock_private',
+ ],
+ 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
+ },
+ {
'target_name': 'people_page',
'dependencies': [
'../compiled_resources2.gyp:route',
'../settings_page/compiled_resources2.gyp:settings_animated_pages',
'<(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',
'easy_unlock_browser_proxy',
'easy_unlock_turn_off_dialog',
+ 'lock_state_behavior',
'profile_info_browser_proxy',
'sync_browser_proxy',
],
@@ -88,7 +98,7 @@
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'quick_unlock_authenticate',
+ 'target_name': 'lock_state_behavior',
'dependencies': [
'../compiled_resources2.gyp:route',
'<(EXTERNS_GYP):quick_unlock_private',
@@ -96,30 +106,21 @@
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'quick_unlock_choose_method',
- 'dependencies': [
- '../compiled_resources2.gyp:route',
- '../prefs/compiled_resources2.gyp:prefs_types',
- '../prefs/compiled_resources2.gyp:prefs_behavior',
- 'quick_unlock_password_detect_behavior',
- '<(EXTERNS_GYP):quick_unlock_private',
- ],
- 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
- },
- {
- 'target_name': 'quick_unlock_password_detect_behavior',
+ 'target_name': 'lock_screen',
'dependencies': [
'../compiled_resources2.gyp:route',
+ 'lock_state_behavior',
+ 'password_prompt_dialog',
+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'quick_unlock_setup_pin',
+ 'target_name': 'setup_pin_dialog',
'dependencies': [
'../compiled_resources2.gyp:route',
- 'quick_unlock_password_detect_behavior',
+ 'password_prompt_dialog',
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
- '<(EXTERNS_GYP):quick_unlock_private',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/lock_screen.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698