chrome/browser/resources/settings/settings_resources.grd - 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_resources.grd

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_page/transition_behavior.js ('K') | « chrome/browser/resources/settings/settings_page/transition_behavior.js ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_resources.grd

diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd

index ca3eab14c00e135607d1f25088ad59684fef85b4..97b56e78ade8a6d96de4476e0d3e1bcfecdb5169 100644

--- a/chrome/browser/resources/settings/settings_resources.grd

+++ b/chrome/browser/resources/settings/settings_resources.grd

@@ -78,6 +78,12 @@

<structure name="IDR_SETTINGS_ANIMATION_ANIMATION_JS"

file="animation/animation.js"

type="chrome_html" />

+ <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_GROUP_HTML"

+ file="animation/animation_group.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_GROUP_JS"

+ file="animation/animation_group.js"

+ type="chrome_html" />

<structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML"

file="settings_page/settings_animated_pages.html"

type="chrome_html" />

@@ -204,6 +210,12 @@

<structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML"

file="settings_page_css.html"

type="chrome_html" />

+ <structure name="IDR_SETTINGS_EXPAND_CARD_TRANSITION_HTML"

+ file="settings_page/expand_card_transition.html"

+ type="chrome_html" />

+ <structure name="IDR_SETTINGS_EXPAND_CARD_TRANSITION_JS"

+ file="settings_page/expand_card_transition.js"

+ type="chrome_html" />

<structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_HTML"

file="settings_page/main_page_behavior.html"

type="chrome_html" />

@@ -216,11 +228,11 @@

<structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"

file="settings_shared_css.html"

type="chrome_html" />

- <structure name="IDR_SETTINGS_TRANSITION_BEHAVIOR_HTML"

- file="settings_page/transition_behavior.html"

+ <structure name="IDR_SETTINGS_OPEN_SECTION_TRANSITION_HTML"

+ file="settings_page/open_section_transition.html"

type="chrome_html" />

- <structure name="IDR_SETTINGS_TRANSITION_BEHAVIOR_JS"

- file="settings_page/transition_behavior.js"

+ <structure name="IDR_SETTINGS_OPEN_SECTION_TRANSITION_JS"

+ file="settings_page/open_section_transition.js"

type="chrome_html" />

<structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"

file="settings_ui/settings_ui.html"