chrome/browser/resources/settings/settings_page/compiled_resources2.gyp - Issue 2106013002: Move settings-section animations into setting-section, make better

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/settings_page/compiled_resources2.gyp

Issue 2106013002: Move settings-section animations into setting-section, make better (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Transitions

Patch Set: rebase, minor fix Created 4 years, 5 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

« chrome/browser/resources/settings/settings_main/settings_main.js ('K') | « chrome/browser/resources/settings/settings_main/settings_main.js ('k') | chrome/browser/resources/settings/settings_page/expand_card_transition.html » ('j') | chrome/browser/resources/settings/settings_page/expand_card_transition.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e8bbb05d1fe5601cfd0d54437ac59a513d569399..d76206f91159eb8473344398bf80328af40dcb25 100644

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

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

@@ -4,12 +4,32 @@

{

'targets': [

{

+ 'target_name': 'expand_card_transition',

+ 'dependencies': [

+ 'settings_section',

+ '../animation/compiled_resources2.gyp:animation',

+ '../animation/compiled_resources2.gyp:animation_group',

+ '<(EXTERNS_GYP):web_animations',

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

+ ],

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

+ },

+ {

'target_name': 'main_page_behavior',

'dependencies': [

'settings_section',

- 'transition_behavior',

+ 'open_section_transition',

'<(EXTERNS_GYP):settings_private',

- '<(EXTERNS_GYP):web_animations',

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

+ ],

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

+ },

+ {

+ 'target_name': 'open_section_transition',

+ 'dependencies': [

+ 'settings_section',

+ 'expand_card_transition',

+ '../animation/compiled_resources2.gyp:animation_group',

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

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

@@ -47,13 +67,5 @@

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

- {

- 'target_name': 'transition_behavior',

- 'dependencies': [

- '<(EXTERNS_GYP):settings_private',

- '<(EXTERNS_GYP):web_animations',

- ],

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

- },

}