Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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: Reworked properties/rebase 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 unified diff | Download patch
« chrome/browser/resources/settings/settings_page/main_page_behavior.js ('K') | « chrome/browser/resources/settings/settings_page/transition_behavior.js ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 type="chrome_html" /> 71 type="chrome_html" />
72 <structure name="IDR_SETTINGS_ALL_SITES_JS" 72 <structure name="IDR_SETTINGS_ALL_SITES_JS"
73 file="site_settings/all_sites.js" 73 file="site_settings/all_sites.js"
74 type="chrome_html" /> 74 type="chrome_html" />
75 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_HTML" 75 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_HTML"
76 file="animation/animation.html" 76 file="animation/animation.html"
77 type="chrome_html" /> 77 type="chrome_html" />
78 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_JS" 78 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_JS"
79 file="animation/animation.js" 79 file="animation/animation.js"
80 type="chrome_html" /> 80 type="chrome_html" />
81 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_GROUP_HTML"
82 file="animation/animation_group.html"
83 type="chrome_html" />
84 <structure name="IDR_SETTINGS_ANIMATION_ANIMATION_GROUP_JS"
85 file="animation/animation_group.js"
86 type="chrome_html" />
81 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML" 87 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_HTML"
82 file="settings_page/settings_animated_pages.html" 88 file="settings_page/settings_animated_pages.html"
83 type="chrome_html" /> 89 type="chrome_html" />
84 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_JS" 90 <structure name="IDR_SETTINGS_CR_SETTINGS_ANIMATED_PAGES_JS"
85 file="settings_page/settings_animated_pages.js" 91 file="settings_page/settings_animated_pages.js"
86 type="chrome_html" /> 92 type="chrome_html" />
87 <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_HTML" 93 <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_HTML"
88 file="appearance_page/appearance_browser_proxy.html" 94 file="appearance_page/appearance_browser_proxy.html"
89 type="chrome_html" /> 95 type="chrome_html" />
90 <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_JS" 96 <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_JS"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 type="chrome_html" /> 206 type="chrome_html" />
201 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_HTML" 207 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_HTML"
202 file="settings_page/settings_subpage.html" 208 file="settings_page/settings_subpage.html"
203 type="chrome_html" /> 209 type="chrome_html" />
204 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_JS" 210 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_JS"
205 file="settings_page/settings_subpage.js" 211 file="settings_page/settings_subpage.js"
206 type="chrome_html" /> 212 type="chrome_html" />
207 <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML" 213 <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS_HTML"
208 file="settings_page_css.html" 214 file="settings_page_css.html"
209 type="chrome_html" /> 215 type="chrome_html" />
216 <structure name="IDR_SETTINGS_EXPAND_CARD_TRANSITION_HTML"
217 file="settings_page/expand_card_transition.html"
218 type="chrome_html" />
219 <structure name="IDR_SETTINGS_EXPAND_CARD_TRANSITION_JS"
220 file="settings_page/expand_card_transition.js"
221 type="chrome_html" />
210 <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_HTML" 222 <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_HTML"
211 file="settings_page/main_page_behavior.html" 223 file="settings_page/main_page_behavior.html"
212 type="chrome_html" /> 224 type="chrome_html" />
213 <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_JS" 225 <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_JS"
214 file="settings_page/main_page_behavior.js" 226 file="settings_page/main_page_behavior.js"
215 type="chrome_html" /> 227 type="chrome_html" />
216 <structure name="IDR_SETTINGS_SETTINGS_ROOT_CSS_HTML" 228 <structure name="IDR_SETTINGS_SETTINGS_ROOT_CSS_HTML"
217 file="settings_root_css.html" 229 file="settings_root_css.html"
218 type="chrome_html" /> 230 type="chrome_html" />
219 <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML" 231 <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"
220 file="settings_shared_css.html" 232 file="settings_shared_css.html"
221 type="chrome_html" /> 233 type="chrome_html" />
222 <structure name="IDR_SETTINGS_TRANSITION_BEHAVIOR_HTML" 234 <structure name="IDR_SETTINGS_OPEN_SECTION_TRANSITION_HTML"
223 file="settings_page/transition_behavior.html" 235 file="settings_page/open_section_transition.html"
224 type="chrome_html" /> 236 type="chrome_html" />
225 <structure name="IDR_SETTINGS_TRANSITION_BEHAVIOR_JS" 237 <structure name="IDR_SETTINGS_OPEN_SECTION_TRANSITION_JS"
226 file="settings_page/transition_behavior.js" 238 file="settings_page/open_section_transition.js"
227 type="chrome_html" /> 239 type="chrome_html" />
228 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML" 240 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"
229 file="settings_ui/settings_ui.html" 241 file="settings_ui/settings_ui.html"
230 type="chrome_html" /> 242 type="chrome_html" />
231 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS" 243 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
232 file="settings_ui/settings_ui.js" 244 file="settings_ui/settings_ui.js"
233 type="chrome_html" /> 245 type="chrome_html" />
234 <if expr="use_nss_certs"> 246 <if expr="use_nss_certs">
235 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML" 247 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"
236 file="certificate_manager_page/certificate_manager_page.html" 248 file="certificate_manager_page/certificate_manager_page.html"
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 type="chrome_html" /> 1070 type="chrome_html" />
1059 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 1071 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
1060 file="people_page/users_page.html" 1072 file="people_page/users_page.html"
1061 type="chrome_html" 1073 type="chrome_html"
1062 flattenhtml="true" 1074 flattenhtml="true"
1063 allowexternalscript="true" /> 1075 allowexternalscript="true" />
1064 </if> 1076 </if>
1065 </structures> 1077 </structures>
1066 </release> 1078 </release>
1067 </grit> 1079 </grit>
OLDNEW
« chrome/browser/resources/settings/settings_page/main_page_behavior.js ('K') | « chrome/browser/resources/settings/settings_page/transition_behavior.js ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698