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

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

Issue 2787153002: MD Settings: Move easy unlock from people to lock screen. (Closed)
Patch Set: Browser tests. Created 3 years, 8 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
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 37bc62038434a9cf192b9dff76eb349aaf193a47..1b322ecfe1ec1ee098a003564e2bd0cbdc9b4eb8 100644
--- a/chrome/browser/resources/settings/people_page/compiled_resources2.gyp
+++ b/chrome/browser/resources/settings/people_page/compiled_resources2.gyp
@@ -82,82 +82,85 @@
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'manage_profile',
+ 'target_name': 'lock_screen',
'dependencies': [
'../compiled_resources2.gyp:route',
- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
+ '<(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',
- 'manage_profile_browser_proxy',
- 'sync_browser_proxy',
+ 'easy_unlock_browser_proxy',
+ 'easy_unlock_turn_off_dialog',
+ 'fingerprint_browser_proxy',
+ 'lock_screen_constants',
+ 'lock_state_behavior',
+ 'password_prompt_dialog',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'manage_profile_browser_proxy',
+ 'target_name': 'lock_screen_constants',
'dependencies': [
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'password_prompt_dialog',
+ 'target_name': 'lock_state_behavior',
'dependencies': [
'../compiled_resources2.gyp:route',
'<(EXTERNS_GYP):quick_unlock_private',
- 'lock_screen_constants',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'people_page',
+ 'target_name': 'manage_profile',
'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:icon',
- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_behavior',
- 'easy_unlock_browser_proxy',
- 'easy_unlock_turn_off_dialog',
- 'lock_screen_constants',
- 'lock_state_behavior',
- 'profile_info_browser_proxy',
+ 'manage_profile_browser_proxy',
'sync_browser_proxy',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'profile_info_browser_proxy',
+ 'target_name': 'manage_profile_browser_proxy',
'dependencies': [
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'lock_state_behavior',
+ 'target_name': 'password_prompt_dialog',
'dependencies': [
'../compiled_resources2.gyp:route',
'<(EXTERNS_GYP):quick_unlock_private',
+ 'lock_screen_constants',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'lock_screen_constants',
+ 'target_name': 'people_page',
'dependencies': [
- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
+ '../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:icon',
+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_behavior',
+ 'lock_screen',
+ 'lock_screen_constants',
+ 'lock_state_behavior',
+ 'profile_info_browser_proxy',
+ 'sync_browser_proxy',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
{
- 'target_name': 'lock_screen',
+ 'target_name': 'profile_info_browser_proxy',
'dependencies': [
- '../compiled_resources2.gyp:route',
- 'fingerprint_browser_proxy',
- 'lock_screen_constants',
- 'lock_state_behavior',
- 'password_prompt_dialog',
- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},
@@ -175,9 +178,9 @@
'target_name': 'setup_pin_dialog',
'dependencies': [
'../compiled_resources2.gyp:route',
+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
'lock_screen_constants',
'password_prompt_dialog',
- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
],
'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],
},

Powered by Google App Engine
This is Rietveld 408576698