chrome/browser/resources/settings/controls/compiled_resources.gyp - Issue 1420533011: [MD settings] change dropdown to accept array of objects rather than array of tuples

Side by Side Diff: chrome/browser/resources/settings/controls/compiled_resources.gyp

Issue 1420533011: [MD settings] change dropdown to accept array of objects rather than array of tuples (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@appearance50p

Patch Set: trybot fix Created 5 years, 1 month 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/settings/clear_browsing_data_page/clear_browsing_data_page.js ('k') | chrome/browser/resources/settings/controls/settings_dropdown_menu.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 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': 'settings_checkbox',	7 'target_name': 'settings_checkbox',

8 'variables': {	8 'variables': {

9 'depends': [	9 'depends': [

	10 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_indica tor_behavior.js',

	11 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_pref_b ehavior.js',

10 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',	12 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',

11 '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time _data',	13 '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time _data',

12 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_indica tor_behavior.js',

13 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_pref_b ehavior.js',

14 ],	14 ],

15 'externs': [	15 'externs': [

16 '../../../../../third_party/closure_compiler/externs/settings_private. js'	16 '../../../../../third_party/closure_compiler/externs/settings_private. js'

17 ],	17 ],

18 },	18 },

19 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],	19 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],

20 },	20 },

21 {	21 {

22 'target_name': 'settings_dropdown_menu',	22 'target_name': 'settings_dropdown_menu',

23 'variables': {	23 'variables': {

24 'depends': [	24 'depends': [

25 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',	25 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',

26 '../../../../../ui/webui/resources/js/compiled_resources.gyp:cr',	26 '../../../../../ui/webui/resources/js/compiled_resources.gyp:cr',

27 '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time _data',	27 '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time _data',

28 '../../../../../ui/webui/resources/js/i18n_behavior.js',	28 '../../../../../ui/webui/resources/js/i18n_behavior.js',

29 '../prefs/pref_util.js',	29 '../prefs/pref_util.js',

30 ],	30 ],

31 'externs': [	31 'externs': [

32 '../../../../../third_party/closure_compiler/externs/settings_private. js'	32 '../../../../../third_party/closure_compiler/externs/settings_private. js'

33 ],	33 ],

34 },	34 },

35 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],	35 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],

36 },	36 },

37 {	37 {

38 'target_name': 'settings_input',	38 'target_name': 'settings_input',

39 'variables': {	39 'variables': {

40 'depends': [	40 'depends': [

	41 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_indica tor_behavior.js',

	42 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_pref_b ehavior.js',

41 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',	43 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',

42 '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time _data',	44 '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time _data',

43 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_indica tor_behavior.js',

44 '../../../../../ui/webui/resources/cr_elements/policy/cr_policy_pref_b ehavior.js',

45 ],	45 ],

46 'externs': [	46 'externs': [

47 '../../../../../third_party/closure_compiler/externs/settings_private. js'	47 '../../../../../third_party/closure_compiler/externs/settings_private. js'

48 ],	48 ],

49 },	49 },

50 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],	50 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],

51 },	51 },

52 {	52 {

53 'target_name': 'settings_radio_group',	53 'target_name': 'settings_radio_group',

54 'variables': {	54 'variables': {

55 'depends': [	55 'depends': [

56 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',	56 '../../../../../ui/webui/resources/js/compiled_resources.gyp:assert',

57 '../../../../../ui/webui/resources/js/compiled_resources.gyp:cr',	57 '../../../../../ui/webui/resources/js/compiled_resources.gyp:cr',

58 '../prefs/pref_util.js',	58 '../prefs/pref_util.js',

59 ],	59 ],

60 'externs': [	60 'externs': [

61 '../../../../../third_party/closure_compiler/externs/settings_private. js'	61 '../../../../../third_party/closure_compiler/externs/settings_private. js'

62 ],	62 ],

63 },	63 },

64 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],	64 'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi' ],

65 },	65 },

66 ],	66 ],

67 }	67 }

OLD	NEW