chrome/browser/resources/settings/settings_resources.grd - Issue 1290583002: Settings: Implement sub-subpages, and clean up some animations.

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1290583002: Settings: Implement sub-subpages, and clean up some animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplify further. fixes display artifact. Created 5 years, 4 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

« chrome/browser/resources/settings/settings_page/settings_section.css ('K') | « chrome/browser/resources/settings/settings_page/settings_section.css ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/settings_resources.h" type="rc_header">	4 <output filename="grit/settings_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/settings_resources_map.cc"	7 <output filename="grit/settings_resources_map.cc"

8 type="resource_file_map_source" />	8 type="resource_file_map_source" />

9 <output filename="grit/settings_resources_map.h"	9 <output filename="grit/settings_resources_map.h"

10 type="resource_map_header" />	10 type="resource_map_header" />

(...skipping 22 matching lines...) Expand all Loading...
33 allowexternalscript="true" />	33 allowexternalscript="true" />

34 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_CSS"	34 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_CSS"

35 file="settings_page/settings_animated_pages.css"	35 file="settings_page/settings_animated_pages.css"

36 type="chrome_html" />	36 type="chrome_html" />

37 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML"	37 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML"

38 file="settings_page/settings_animated_pages.html"	38 file="settings_page/settings_animated_pages.html"

39 type="chrome_html" />	39 type="chrome_html" />

40 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_JS"	40 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_JS"

41 file="settings_page/settings_animated_pages.js"	41 file="settings_page/settings_animated_pages.js"

42 type="chrome_html" />	42 type="chrome_html" />

43 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATIONS_JS"

44 file="settings_page/settings_animations.js"

45 type="chrome_html" />

46 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_CSS"	43 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_CSS"

47 file="appearance_page/appearance_page.css"	44 file="appearance_page/appearance_page.css"

48 type="chrome_html" />	45 type="chrome_html" />

49 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_HTML"	46 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_HTML"

50 file="appearance_page/appearance_page.html"	47 file="appearance_page/appearance_page.html"

51 type="chrome_html"	48 type="chrome_html"

52 flattenhtml="true"	49 flattenhtml="true"

53 allowexternalscript="true" />	50 allowexternalscript="true" />

54 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_JS"	51 <structure name="IDR_SETTINGS_APPEARANCE_PAGE_JS"

55 file="appearance_page/appearance_page.js"	52 file="appearance_page/appearance_page.js"

(...skipping 318 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
374 type="chrome_html"	371 type="chrome_html"

375 flattenhtml="true"	372 flattenhtml="true"

376 allowexternalscript="true" />	373 allowexternalscript="true" />

377 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	374 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

378 file="users_page/users_page.css"	375 file="users_page/users_page.css"

379 type="chrome_html" />	376 type="chrome_html" />

380 </if>	377 </if>

381 </structures>	378 </structures>

382 </release>	379 </release>

383 </grit>	380 </grit>

OLD	NEW