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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2084843002: [MD History] Add history-list-container between app and history lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tim_toolbar
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.html » ('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"> 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 <include name="IDR_MD_HISTORY_HISTORY_ITEM_HTML" file="resources\md_hist ory\history_item.html" type="BINDATA" /> 222 <include name="IDR_MD_HISTORY_HISTORY_ITEM_HTML" file="resources\md_hist ory\history_item.html" type="BINDATA" />
223 <include name="IDR_MD_HISTORY_HISTORY_ITEM_JS" file="resources\md_histor y\history_item.js" type="BINDATA" /> 223 <include name="IDR_MD_HISTORY_HISTORY_ITEM_JS" file="resources\md_histor y\history_item.js" type="BINDATA" />
224 <include name="IDR_MD_HISTORY_HISTORY_JS" file="resources\md_history\his tory.js" type="BINDATA" /> 224 <include name="IDR_MD_HISTORY_HISTORY_JS" file="resources\md_history\his tory.js" type="BINDATA" />
225 <include name="IDR_MD_HISTORY_HISTORY_LIST_HTML" file="resources\md_hist ory\history_list.html" type="BINDATA" /> 225 <include name="IDR_MD_HISTORY_HISTORY_LIST_HTML" file="resources\md_hist ory\history_list.html" type="BINDATA" />
226 <include name="IDR_MD_HISTORY_HISTORY_LIST_JS" file="resources\md_histor y\history_list.js" type="BINDATA" /> 226 <include name="IDR_MD_HISTORY_HISTORY_LIST_JS" file="resources\md_histor y\history_list.js" type="BINDATA" />
227 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML" file="resources\md_h istory\history_toolbar.html" type="BINDATA" /> 227 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_HTML" file="resources\md_h istory\history_toolbar.html" type="BINDATA" />
228 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_JS" file="resources\md_his tory\history_toolbar.js" type="BINDATA" /> 228 <include name="IDR_MD_HISTORY_HISTORY_TOOLBAR_JS" file="resources\md_his tory\history_toolbar.js" type="BINDATA" />
229 <include name="IDR_MD_HISTORY_ICONS_HTML" file="resources\md_history\ico ns.html" type="BINDATA" /> 229 <include name="IDR_MD_HISTORY_ICONS_HTML" file="resources\md_history\ico ns.html" type="BINDATA" />
230 <include name="IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG" file="resour ces\md_history\images\100\sign_in_promo.png" type="BINDATA" /> 230 <include name="IDR_MD_HISTORY_IMAGES_100_SIGN_IN_PROMO_PNG" file="resour ces\md_history\images\100\sign_in_promo.png" type="BINDATA" />
231 <include name="IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG" file="resour ces\md_history\images\200\sign_in_promo.png" type="BINDATA" /> 231 <include name="IDR_MD_HISTORY_IMAGES_200_SIGN_IN_PROMO_PNG" file="resour ces\md_history\images\200\sign_in_promo.png" type="BINDATA" />
232 <include name="IDR_MD_HISTORY_LIST_CONTAINER_HTML" file="resources\md_hi story\list_container.html" type="BINDATA" />
233 <include name="IDR_MD_HISTORY_LIST_CONTAINER_JS" file="resources\md_hist ory\list_container.js" type="BINDATA" />
232 <include name="IDR_MD_HISTORY_SEARCHED_LABEL_HTML" file="resources\md_hi story\searched_label.html" type="BINDATA" /> 234 <include name="IDR_MD_HISTORY_SEARCHED_LABEL_HTML" file="resources\md_hi story\searched_label.html" type="BINDATA" />
233 <include name="IDR_MD_HISTORY_SEARCHED_LABEL_JS" file="resources\md_hist ory\searched_label.js" type="BINDATA" /> 235 <include name="IDR_MD_HISTORY_SEARCHED_LABEL_JS" file="resources\md_hist ory\searched_label.js" type="BINDATA" />
234 <include name="IDR_MD_HISTORY_SHARED_STYLE_HTML" file="resources\md_hist ory\shared_style.html" type="BINDATA" /> 236 <include name="IDR_MD_HISTORY_SHARED_STYLE_HTML" file="resources\md_hist ory\shared_style.html" type="BINDATA" />
235 <include name="IDR_MD_HISTORY_SIDE_BAR_HTML" file="resources\md_history\ side_bar.html" type="BINDATA" /> 237 <include name="IDR_MD_HISTORY_SIDE_BAR_HTML" file="resources\md_history\ side_bar.html" type="BINDATA" />
236 <include name="IDR_MD_HISTORY_SIDE_BAR_JS" file="resources\md_history\si de_bar.js" type="BINDATA" /> 238 <include name="IDR_MD_HISTORY_SIDE_BAR_JS" file="resources\md_history\si de_bar.js" type="BINDATA" />
237 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML" file="resources\m d_history\synced_device_card.html" type="BINDATA" /> 239 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_CARD_HTML" file="resources\m d_history\synced_device_card.html" type="BINDATA" />
238 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS" file="resources\md_ history\synced_device_card.js" type="BINDATA" /> 240 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_CARD_JS" file="resources\md_ history\synced_device_card.js" type="BINDATA" />
239 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML" file="resource s\md_history\synced_device_manager.html" type="BINDATA" /> 241 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_HTML" file="resource s\md_history\synced_device_manager.html" type="BINDATA" />
240 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS" file="resources\ md_history\synced_device_manager.js" type="BINDATA" /> 242 <include name="IDR_MD_HISTORY_SYNCED_DEVICE_MANAGER_JS" file="resources\ md_history\synced_device_manager.js" type="BINDATA" />
241 </if> 243 </if>
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" /> 545 <include name="IDR_CAST_FAVICON" file="resources\cast\cast_favicon.ico" type="BINDATA" />
544 </if> 546 </if>
545 <if expr="not is_android and not is_ios and not chromeos"> 547 <if expr="not is_android and not is_ios and not chromeos">
546 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 548 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
547 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 549 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
548 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 550 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
549 </if> 551 </if>
550 </includes> 552 </includes>
551 </release> 553 </release>
552 </grit> 554 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/app.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698