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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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: Fixed patch set 7 errors. 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/options_resources.grd ('k') | chrome/browser/resources/settings/people_page/lock_screen.html » ('j') | chrome/browser/resources/settings/people_page/lock_screen.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'targets': [ 5 'targets': [
6 { 6 {
7 'target_name': 'camera', 7 'target_name': 'camera',
8 'dependencies': [ 8 'dependencies': [
9 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data', 9 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
10 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util', 10 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 79 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
80 }, 80 },
81 { 81 {
82 'target_name': 'import_data_browser_proxy', 82 'target_name': 'import_data_browser_proxy',
83 'dependencies': [ 83 'dependencies': [
84 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', 84 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
85 ], 85 ],
86 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 86 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
87 }, 87 },
88 { 88 {
89 'target_name': 'manage_profile', 89 'target_name': 'lock_screen',
90 'dependencies': [ 90 'dependencies': [
91 '../compiled_resources2.gyp:route', 91 '../compiled_resources2.gyp:route',
92 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', 92 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
93 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
93 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior', 94 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior',
94 'manage_profile_browser_proxy', 95 'easy_unlock_browser_proxy',
95 'sync_browser_proxy', 96 'easy_unlock_turn_off_dialog',
97 'fingerprint_browser_proxy',
98 'lock_screen_constants',
99 'lock_state_behavior',
100 'password_prompt_dialog',
96 ], 101 ],
97 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 102 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
98 }, 103 },
99 { 104 {
100 'target_name': 'manage_profile_browser_proxy', 105 'target_name': 'lock_screen_constants',
101 'dependencies': [ 106 'dependencies': [
102 '<(DEPTH)/ui/webui/resources/cr_elements/cr_profile_avatar_selector/comp iled_resources2.gyp:cr_profile_avatar_selector', 107 '<(DEPTH)/ui/webui/resources/cr_elements/cr_profile_avatar_selector/comp iled_resources2.gyp:cr_profile_avatar_selector',
103 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', 108 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
104 ], 109 ],
105 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 110 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
106 }, 111 },
107 { 112 {
113 'target_name': 'lock_state_behavior',
114 'dependencies': [
115 '../compiled_resources2.gyp:route',
116 '<(EXTERNS_GYP):quick_unlock_private',
117 ],
118 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
119 },
120 {
121 'target_name': 'manage_profile',
122 'dependencies': [
123 '../compiled_resources2.gyp:route',
124 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
125 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior',
126 'manage_profile_browser_proxy',
127 'sync_browser_proxy',
128 ],
129 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
130 },
131 {
132 'target_name': 'manage_profile_browser_proxy',
133 'dependencies': [
134 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
135 ],
136 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
137 },
138 {
108 'target_name': 'password_prompt_dialog', 139 'target_name': 'password_prompt_dialog',
109 'dependencies': [ 140 'dependencies': [
110 '../compiled_resources2.gyp:route', 141 '../compiled_resources2.gyp:route',
111 '<(EXTERNS_GYP):quick_unlock_private', 142 '<(EXTERNS_GYP):quick_unlock_private',
112 'lock_screen_constants', 143 'lock_screen_constants',
113 ], 144 ],
114 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 145 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
115 }, 146 },
116 { 147 {
117 'target_name': 'people_page', 148 'target_name': 'people_page',
118 'dependencies': [ 149 'dependencies': [
119 '../compiled_resources2.gyp:route', 150 '../compiled_resources2.gyp:route',
120 '../settings_page/compiled_resources2.gyp:settings_animated_pages', 151 '../settings_page/compiled_resources2.gyp:settings_animated_pages',
121 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', 152 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
122 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', 153 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
123 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:icon', 154 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:icon',
124 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data', 155 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',
125 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:util',
126 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior', 156 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior',
127 'easy_unlock_browser_proxy', 157 » 'lock_screen',
128 'easy_unlock_turn_off_dialog',
129 'lock_screen_constants', 158 'lock_screen_constants',
130 'lock_state_behavior', 159 'lock_state_behavior',
131 'profile_info_browser_proxy', 160 'profile_info_browser_proxy',
132 'sync_browser_proxy', 161 'sync_browser_proxy',
133 ], 162 ],
134 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 163 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
135 }, 164 },
136 { 165 {
137 'target_name': 'profile_info_browser_proxy', 166 'target_name': 'profile_info_browser_proxy',
138 'dependencies': [ 167 'dependencies': [
139 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr', 168 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
140 ], 169 ],
141 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 170 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
142 }, 171 },
143 {
144 'target_name': 'lock_state_behavior',
145 'dependencies': [
146 '../compiled_resources2.gyp:route',
147 '<(EXTERNS_GYP):quick_unlock_private',
148 ],
149 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
150 },
151 {
152 'target_name': 'lock_screen_constants',
153 'dependencies': [
154 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',
155 ],
156 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
157 },
158 {
159 'target_name': 'lock_screen',
160 'dependencies': [
161 '../compiled_resources2.gyp:route',
162 'fingerprint_browser_proxy',
163 'lock_screen_constants',
164 'lock_state_behavior',
165 'password_prompt_dialog',
166 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
167 ],
168 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
169 },
170 { 172 {
171 'target_name': 'setup_fingerprint_dialog', 173 'target_name': 'setup_fingerprint_dialog',
172 'dependencies': [ 174 'dependencies': [
173 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', 175 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
174 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior', 176 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior',
175 'fingerprint_browser_proxy', 177 'fingerprint_browser_proxy',
176 'fingerprint_progress_arc', 178 'fingerprint_progress_arc',
177 ], 179 ],
178 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 180 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
179 }, 181 },
180 { 182 {
181 'target_name': 'setup_pin_dialog', 183 'target_name': 'setup_pin_dialog',
182 'dependencies': [ 184 'dependencies': [
183 '../compiled_resources2.gyp:route', 185 '../compiled_resources2.gyp:route',
186 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
184 'lock_screen_constants', 187 'lock_screen_constants',
185 'password_prompt_dialog', 188 'password_prompt_dialog',
186 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
187 ], 189 ],
188 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 190 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
189 }, 191 },
190 { 192 {
191 'target_name': 'sync_page', 193 'target_name': 'sync_page',
192 'dependencies': [ 194 'dependencies': [
193 '../compiled_resources2.gyp:route', 195 '../compiled_resources2.gyp:route',
194 '../settings_page/compiled_resources2.gyp:settings_animated_pages', 196 '../settings_page/compiled_resources2.gyp:settings_animated_pages',
195 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-input/compi led_resources2.gyp:paper-input-extracted', 197 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/paper-input/compi led_resources2.gyp:paper-input-extracted',
196 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', 198 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'dependencies': [ 242 'dependencies': [
241 '../prefs/compiled_resources2.gyp:prefs_behavior', 243 '../prefs/compiled_resources2.gyp:prefs_behavior',
242 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', 244 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
243 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior', 245 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_ behavior',
244 'import_data_browser_proxy', 246 'import_data_browser_proxy',
245 ], 247 ],
246 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 248 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
247 }, 249 },
248 ], 250 ],
249 } 251 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options_resources.grd ('k') | chrome/browser/resources/settings/people_page/lock_screen.html » ('j') | chrome/browser/resources/settings/people_page/lock_screen.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698