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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1641543002: MD History: Refactored design for displaying history information (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@second_patch
Patch Set: removed dodgy fix for end of history query: Created 4 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/compiled_resources.gyp » ('j') | chrome/browser/resources/md_history/compiled_resources.gyp » ('J')
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"> 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho tword_audio_verification\manifest.json" type="BINDATA" /> 195 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho tword_audio_verification\manifest.json" type="BINDATA" />
196 <if expr="not is_android"> 196 <if expr="not is_android">
197 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" /> 197 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" />
198 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" /> 198 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" />
199 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" /> 199 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" />
200 </if> 200 </if>
201 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 201 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
202 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 202 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
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" />
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" />
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" />
210 <include name="IDR_MD_HISTORY_HISTORY_ITEM_HTML" file="resources\md_hist ory\history_item.html" type="BINDATA" /> 205 <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" /> 206 <include name="IDR_MD_HISTORY_HISTORY_ITEM_JS" file="resources\md_histor y\history_item.js" type="BINDATA" />
207 <include name="IDR_MD_HISTORY_HISTORY_LIST_HTML" file="resources\md_hist ory\history_list.html" type="BINDATA" />
208 <include name="IDR_MD_HISTORY_HISTORY_LIST_JS" file="resources\md_histor y\history_list.js" type="BINDATA" />
209 <include name="IDR_MD_HISTORY_HISTORY_HTML" file="resources\md_history\h istory.html" type="BINDATA" />
tsergeant 2016/02/02 05:58:00 history.html is out of order, sort these again.
yingran 2016/02/02 06:49:10 Done.
212 <include name="IDR_MD_HISTORY_HISTORY_JS" file="resources\md_history\his tory.js" type="BINDATA" /> 210 <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" /> 211 <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" /> 212 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_JS" file="resources\md_his tory\history_toolbar.js" type="BINDATA" />
215 </if> 213 </if>
216 214
217 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" /> 215 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" />
218 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" /> 216 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" />
219 <include name="IDR_NEW_INLINE_LOGIN_HTML" file="resources\inline_login\new _inline_login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 217 <include name="IDR_NEW_INLINE_LOGIN_HTML" file="resources\inline_login\new _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" /> 218 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
221 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" /> 219 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" />
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 </if> 478 </if>
481 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 479 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
482 </if> 480 </if>
483 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 481 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
484 <if expr="enable_media_router"> 482 <if expr="enable_media_router">
485 <part file="media_router_resources.grdp" /> 483 <part file="media_router_resources.grdp" />
486 </if> 484 </if>
487 </includes> 485 </includes>
488 </release> 486 </release>
489 </grit> 487 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/compiled_resources.gyp » ('j') | chrome/browser/resources/md_history/compiled_resources.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698