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

Side by Side Diff: chrome/browser/resources/settings/internet_page/compiled_resources2.gyp

Issue 2605373002: MD Settings: Internet: Fix Proxy UI (Closed)
Patch Set: Rebase, Fix comments / formatting Created 3 years, 11 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 | « no previous file | chrome/browser/resources/settings/internet_page/network_proxy.html » ('j') | no next file with comments »
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': 'internet_page', 7 'target_name': 'internet_page',
8 'dependencies': [ 8 'dependencies': [
9 '../compiled_resources2.gyp:route', 9 '../compiled_resources2.gyp:route',
10 '../settings_page/compiled_resources2.gyp:settings_animated_pages', 10 '../settings_page/compiled_resources2.gyp:settings_animated_pages',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 '<(DEPTH)/ui/webui/resources/cr_elements/network/compiled_resources2.gyp :cr_onc_types', 69 '<(DEPTH)/ui/webui/resources/cr_elements/network/compiled_resources2.gyp :cr_onc_types',
70 '<(DEPTH)/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp: cr_policy_network_behavior', 70 '<(DEPTH)/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp: cr_policy_network_behavior',
71 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', 71 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
72 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', 72 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
73 ], 73 ],
74 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 74 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
75 }, 75 },
76 { 76 {
77 'target_name': 'network_proxy', 77 'target_name': 'network_proxy',
78 'dependencies': [ 78 'dependencies': [
79 '../compiled_resources2.gyp:route',
79 '../controls/compiled_resources2.gyp:settings_checkbox', 80 '../controls/compiled_resources2.gyp:settings_checkbox',
80 '../prefs/compiled_resources2.gyp:prefs_behavior', 81 '../prefs/compiled_resources2.gyp:prefs_behavior',
81 '<(DEPTH)/ui/webui/resources/cr_elements/network/compiled_resources2.gyp :cr_onc_types', 82 '<(DEPTH)/ui/webui/resources/cr_elements/network/compiled_resources2.gyp :cr_onc_types',
82 '<(DEPTH)/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp: cr_policy_network_behavior', 83 '<(DEPTH)/ui/webui/resources/cr_elements/policy/compiled_resources2.gyp: cr_policy_network_behavior',
83 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', 84 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
84 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior', 85 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
85 ], 86 ],
86 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 87 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
87 }, 88 },
88 { 89 {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 'dependencies': [ 121 'dependencies': [
121 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-a11y-keys-be havior/compiled_resources2.gyp:iron-a11y-keys-behavior-extracted', 122 '<(DEPTH)/third_party/polymer/v1_0/components-chromium/iron-a11y-keys-be havior/compiled_resources2.gyp:iron-a11y-keys-behavior-extracted',
122 '<(DEPTH)/ui/webui/resources/cr_elements/network/compiled_resources2.gyp :cr_onc_types', 123 '<(DEPTH)/ui/webui/resources/cr_elements/network/compiled_resources2.gyp :cr_onc_types',
123 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert', 124 '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
124 '<(INTERFACES_GYP):networking_private_interface', 125 '<(INTERFACES_GYP):networking_private_interface',
125 ], 126 ],
126 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '], 127 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi '],
127 }, 128 },
128 ], 129 ],
129 } 130 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/internet_page/network_proxy.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698