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

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

Issue 1572383006: MD History: Hook all elements into the page and add tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@patch
Patch Set: Address reviewer comments. Created 4 years, 11 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 <if expr="not is_ios"> 204 <if expr="not is_ios">
205 <include name="IDR_MD_HISTORY_HISTORY_CARD_HTML" file="resources\md_hist ory\history_card.html" type="BINDATA" /> 205 <include name="IDR_MD_HISTORY_HISTORY_CARD_HTML" file="resources\md_hist ory\history_card.html" type="BINDATA" />
206 <include name="IDR_MD_HISTORY_HISTORY_CARD_JS" file="resources\md_histor y\history_card.js" type="BINDATA" /> 206 <include name="IDR_MD_HISTORY_HISTORY_CARD_JS" file="resources\md_histor y\history_card.js" type="BINDATA" />
207 <include name="IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML" file="resources \md_history\history_card_manager.html" type="BINDATA" /> 207 <include name="IDR_MD_HISTORY_HISTORY_CARD_MANAGER_HTML" file="resources \md_history\history_card_manager.html" type="BINDATA" />
208 <include name="IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS" file="resources\m d_history\history_card_manager.js" type="BINDATA" /> 208 <include name="IDR_MD_HISTORY_HISTORY_CARD_MANAGER_JS" file="resources\m d_history\history_card_manager.js" type="BINDATA" />
209 <include name="IDR_MD_HISTORY_HISTORY_HTML" file="resources\md_history\h istory.html" type="BINDATA" /> 209 <include name="IDR_MD_HISTORY_HISTORY_HTML" file="resources\md_history\h istory.html" type="BINDATA" />
210 <include name="IDR_MD_HISTORY_HISTORY_ITEM_HTML" file="resources\md_hist ory\history_item.html" type="BINDATA" /> 210 <include name="IDR_MD_HISTORY_HISTORY_ITEM_HTML" file="resources\md_hist ory\history_item.html" type="BINDATA" />
211 <include name="IDR_MD_HISTORY_HISTORY_ITEM_JS" file="resources\md_histor y\history_item.js" type="BINDATA" /> 211 <include name="IDR_MD_HISTORY_HISTORY_ITEM_JS" file="resources\md_histor y\history_item.js" type="BINDATA" />
212 <include name="IDR_MD_HISTORY_HISTORY_JS" file="resources\md_history\his tory.js" type="BINDATA" /> 212 <include name="IDR_MD_HISTORY_HISTORY_JS" file="resources\md_history\his tory.js" type="BINDATA" />
213 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML" file="resources\md_h istory\history_toolbar.html" type="BINDATA" />
214 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_JS" file="resources\md_his tory\history_toolbar.js" type="BINDATA" />
213 </if> 215 </if>
214 216
215 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" /> 217 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" />
216 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" /> 218 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" />
217 <include name="IDR_NEW_INLINE_LOGIN_HTML" file="resources\inline_login\new _inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 219 <include name="IDR_NEW_INLINE_LOGIN_HTML" file="resources\inline_login\new _inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
218 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 220 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
219 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" /> 221 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" />
220 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" /> 222 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" />
221 <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_h ost\authenticator.js" flattenhtml="true" type="BINDATA" /> 223 <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_h ost\authenticator.js" flattenhtml="true" type="BINDATA" />
222 <include name="IDR_GAIA_AUTH_HOST_JS" file="resources\gaia_auth_host\gaia_ auth_host.js" flattenhtml="true" type="BINDATA" /> 224 <include name="IDR_GAIA_AUTH_HOST_JS" file="resources\gaia_auth_host\gaia_ auth_host.js" flattenhtml="true" type="BINDATA" />
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 </if> 476 </if>
475 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 477 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
476 </if> 478 </if>
477 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 479 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
478 <if expr="enable_media_router"> 480 <if expr="enable_media_router">
479 <part file="media_router_resources.grdp" /> 481 <part file="media_router_resources.grdp" />
480 </if> 482 </if>
481 </includes> 483 </includes>
482 </release> 484 </release>
483 </grit> 485 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698