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

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 1313453002: Make cr.ui.Focus* play nice with Shadow DOM and MD chrome://downloads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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
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"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 <if expr="not is_android"> 124 <if expr="not is_android">
125 <include name="IDR_DOWNLOADS_CONSTANTS_HTML" file="resources\downloads\c onstants.html" type="BINDATA" /> 125 <include name="IDR_DOWNLOADS_CONSTANTS_HTML" file="resources\downloads\c onstants.html" type="BINDATA" />
126 <include name="IDR_DOWNLOADS_CONSTANTS_JS" file="resources\downloads\con stants.js" type="BINDATA" /> 126 <include name="IDR_DOWNLOADS_CONSTANTS_JS" file="resources\downloads\con stants.js" type="BINDATA" />
127 <include name="IDR_DOWNLOADS_FOCUS_ROW_JS" file="resources\downloads\foc us_row.js" type="BINDATA" /> 127 <include name="IDR_DOWNLOADS_FOCUS_ROW_JS" file="resources\downloads\foc us_row.js" type="BINDATA" />
128 <include name="IDR_DOWNLOADS_ITEM_VIEW_JS" file="resources\downloads\ite m_view.js" type="BINDATA" /> 128 <include name="IDR_DOWNLOADS_ITEM_VIEW_JS" file="resources\downloads\ite m_view.js" type="BINDATA" />
129 <include name="IDR_DOWNLOADS_MANAGER_JS" file="resources\downloads\manag er.js" type="BINDATA" /> 129 <include name="IDR_DOWNLOADS_MANAGER_JS" file="resources\downloads\manag er.js" type="BINDATA" />
130 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_HTML" file="resources \downloads\throttled_icon_loader.html" type="BINDATA" /> 130 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_HTML" file="resources \downloads\throttled_icon_loader.html" type="BINDATA" />
131 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_JS" file="resources\d ownloads\throttled_icon_loader.js" type="BINDATA" /> 131 <include name="IDR_DOWNLOADS_THROTTLED_ICON_LOADER_JS" file="resources\d ownloads\throttled_icon_loader.js" type="BINDATA" />
132 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_HTML" file="resources\md_ downloads\action_service.html" type="BINDATA" /> 132 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_HTML" file="resources\md_ downloads\action_service.html" type="BINDATA" />
133 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_JS" file="resources\md_do wnloads\action_service.js" type="BINDATA" /> 133 <include name="IDR_MD_DOWNLOADS_ACTION_SERVICE_JS" file="resources\md_do wnloads\action_service.js" type="BINDATA" />
134 <include name="IDR_MD_DOWNLOADS_FOCUS_ROW_HTML" file="resources\md_downl oads\focus_row.html" type="BINDATA" />
135 <include name="IDR_MD_DOWNLOADS_FOCUS_ROW_JS" file="resources\md_downloa ds\focus_row.js" type="BINDATA" />
134 <include name="IDR_MD_DOWNLOADS_ITEM_CSS" file="resources\md_downloads\i tem.css" type="BINDATA" flattenhtml="true" /> 136 <include name="IDR_MD_DOWNLOADS_ITEM_CSS" file="resources\md_downloads\i tem.css" type="BINDATA" flattenhtml="true" />
135 <include name="IDR_MD_DOWNLOADS_ITEM_HTML" file="resources\md_downloads\ item.html" type="BINDATA" /> 137 <include name="IDR_MD_DOWNLOADS_ITEM_HTML" file="resources\md_downloads\ item.html" type="BINDATA" />
136 <include name="IDR_MD_DOWNLOADS_ITEM_JS" file="resources\md_downloads\it em.js" type="BINDATA" /> 138 <include name="IDR_MD_DOWNLOADS_ITEM_JS" file="resources\md_downloads\it em.js" type="BINDATA" />
137 <include name="IDR_MD_DOWNLOADS_MANAGER_CSS" file="resources\md_download s\manager.css" type="BINDATA" flattenhtml="true" /> 139 <include name="IDR_MD_DOWNLOADS_MANAGER_CSS" file="resources\md_download s\manager.css" type="BINDATA" flattenhtml="true" />
138 <include name="IDR_MD_DOWNLOADS_MANAGER_HTML" file="resources\md_downloa ds\manager.html" type="BINDATA" /> 140 <include name="IDR_MD_DOWNLOADS_MANAGER_HTML" file="resources\md_downloa ds\manager.html" type="BINDATA" />
139 <include name="IDR_MD_DOWNLOADS_MANAGER_JS" file="resources\md_downloads \manager.js" type="BINDATA" /> 141 <include name="IDR_MD_DOWNLOADS_MANAGER_JS" file="resources\md_downloads \manager.js" type="BINDATA" />
140 <include name="IDR_MD_DOWNLOADS_SHARED_STYLE_CSS" file="resources\md_dow nloads\shared_style.css" type="BINDATA" /> 142 <include name="IDR_MD_DOWNLOADS_SHARED_STYLE_CSS" file="resources\md_dow nloads\shared_style.css" type="BINDATA" />
141 <include name="IDR_MD_DOWNLOADS_STRINGS_HTML" file="resources\md_downloa ds\strings.html" type="BINDATA" /> 143 <include name="IDR_MD_DOWNLOADS_STRINGS_HTML" file="resources\md_downloa ds\strings.html" type="BINDATA" />
142 <include name="IDR_MD_DOWNLOADS_TOOLBAR_CSS" file="resources\md_download s\toolbar.css" type="BINDATA" /> 144 <include name="IDR_MD_DOWNLOADS_TOOLBAR_CSS" file="resources\md_download s\toolbar.css" type="BINDATA" />
143 <include name="IDR_MD_DOWNLOADS_TOOLBAR_HTML" file="resources\md_downloa ds\toolbar.html" type="BINDATA" /> 145 <include name="IDR_MD_DOWNLOADS_TOOLBAR_HTML" file="resources\md_downloa ds\toolbar.html" type="BINDATA" />
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 </if> 444 </if>
443 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 445 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
444 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 446 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
445 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 447 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
446 <if expr="enable_media_router"> 448 <if expr="enable_media_router">
447 <part file="media_router_resources.grdp" /> 449 <part file="media_router_resources.grdp" />
448 </if> 450 </if>
449 </includes> 451 </includes>
450 </release> 452 </release>
451 </grit> 453 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698