chrome/browser/resources/settings/site_settings/compiled_resources2.gyp - Issue 2554403005: [MD settings] move extra options in category settings

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2554403005: [MD settings] move extra options in category settings (Closed)

Patch Set: merge with master; review changes Created 4 years 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/browser/resources/settings/site_settings/category_setting_exceptions.js ('k') | chrome/browser/resources/settings/site_settings/site_settings_category.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/site_settings/compiled_resources2.gyp

diff --git a/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp b/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp

index fd7cab24c18f3bcc5beca3328e39a4f2933ab4e5..d98913ce52fe9e9100306400170847ea9df0e7e1 100644

--- a/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp

+++ b/chrome/browser/resources/settings/site_settings/compiled_resources2.gyp

@@ -25,6 +25,30 @@

'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

{

+ 'target_name': 'category_default_setting',

+ 'dependencies': [

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_behavior',

+ '<(EXTERNS_GYP):settings_private',

+ '../settings_page/compiled_resources2.gyp:settings_animated_pages',

+ 'constants',

+ 'site_settings_behavior',

+ ],

+ 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

+ },

+ {

+ 'target_name': 'category_setting_exceptions',

+ 'dependencies': [

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',

+ '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',

+ '<(EXTERNS_GYP):settings_private',

+ '../settings_page/compiled_resources2.gyp:settings_animated_pages',

+ 'constants',

+ ],

+ 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

+ },

+ {

'target_name': 'constants',

'dependencies': [

'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',

@@ -160,19 +184,6 @@

'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

{

- 'target_name': 'site_settings_category',

- 'dependencies': [

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',

- '<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:web_ui_listener_behavior',

- '<(EXTERNS_GYP):settings_private',

- '../settings_page/compiled_resources2.gyp:settings_animated_pages',

- 'constants',

- 'site_settings_behavior',

- ],

- 'includes': ['../../../../../third_party/closure_compiler/compile_js2.gypi'],

- },

- {

'target_name': 'site_settings_prefs_browser_proxy',

'dependencies': [

'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:cr',