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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1308893009: [MD Extensions] Move search field out of downloads, use it in extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: License + Nit Created 5 years, 3 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/md_downloads/compiled_resources.gyp » ('j') | ui/webui/resources/cr_elements/v1_0/cr_search_field/cr_search_field.html » ('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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 <include name="IDR_MD_DOWNLOADS_SHARED_STYLE_CSS" file="resources\md_dow nloads\shared_style.css" type="BINDATA" /> 139 <include name="IDR_MD_DOWNLOADS_SHARED_STYLE_CSS" file="resources\md_dow nloads\shared_style.css" type="BINDATA" />
140 <include name="IDR_MD_DOWNLOADS_STRINGS_HTML" file="resources\md_downloa ds\strings.html" type="BINDATA" /> 140 <include name="IDR_MD_DOWNLOADS_STRINGS_HTML" file="resources\md_downloa ds\strings.html" type="BINDATA" />
141 <include name="IDR_MD_DOWNLOADS_TOOLBAR_CSS" file="resources\md_download s\toolbar.css" type="BINDATA" /> 141 <include name="IDR_MD_DOWNLOADS_TOOLBAR_CSS" file="resources\md_download s\toolbar.css" type="BINDATA" />
142 <include name="IDR_MD_DOWNLOADS_TOOLBAR_HTML" file="resources\md_downloa ds\toolbar.html" type="BINDATA" /> 142 <include name="IDR_MD_DOWNLOADS_TOOLBAR_HTML" file="resources\md_downloa ds\toolbar.html" type="BINDATA" />
143 <include name="IDR_MD_DOWNLOADS_TOOLBAR_JS" file="resources\md_downloads \toolbar.js" type="BINDATA" /> 143 <include name="IDR_MD_DOWNLOADS_TOOLBAR_JS" file="resources\md_downloads \toolbar.js" type="BINDATA" />
144 </if> 144 </if>
145 <if expr="enable_extensions"> 145 <if expr="enable_extensions">
146 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" /> 146 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" />
147 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 147 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
148 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 148 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
149 <include name="IDR_MD_EXTENSIONS_MANAGER_CSS" file="resources\md_extensi ons\manager.css" type="BINDATA" />
149 <include name="IDR_MD_EXTENSIONS_MANAGER_HTML" file="resources\md_extens ions\manager.html" type="BINDATA" /> 150 <include name="IDR_MD_EXTENSIONS_MANAGER_HTML" file="resources\md_extens ions\manager.html" type="BINDATA" />
150 <include name="IDR_MD_EXTENSIONS_MANAGER_JS" file="resources\md_extensio ns\manager.js" type="BINDATA" /> 151 <include name="IDR_MD_EXTENSIONS_MANAGER_JS" file="resources\md_extensio ns\manager.js" type="BINDATA" />
152 <include name="IDR_MD_EXTENSIONS_TOOLBAR_CSS" file="resources\md_extensi ons\toolbar.css" type="BINDATA" />
153 <include name="IDR_MD_EXTENSIONS_TOOLBAR_HTML" file="resources\md_extens ions\toolbar.html" type="BINDATA" />
154 <include name="IDR_MD_EXTENSIONS_TOOLBAR_JS" file="resources\md_extensio ns\toolbar.js" type="BINDATA" />
151 <include name="IDR_MD_EXTENSIONS_STRINGS_HTML" file="resources\md_extens ions\strings.html" type="BINDATA" /> 155 <include name="IDR_MD_EXTENSIONS_STRINGS_HTML" file="resources\md_extens ions\strings.html" type="BINDATA" />
152 </if> 156 </if>
153 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" /> 157 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" />
154 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" type="BINDATA" /> 158 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" type="BINDATA" />
155 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" type="BINDATA" /> 159 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" type="BINDATA" />
156 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" type="BINDATA" /> 160 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" type="BINDATA" />
157 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 161 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
158 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 162 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
159 <if expr="_google_chrome or enable_hangout_services_extension"> 163 <if expr="_google_chrome or enable_hangout_services_extension">
160 <!-- Hangout Services extension, included in Google Chrome builds only. --> 164 <!-- Hangout Services extension, included in Google Chrome builds only. -->
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 </if> 450 </if>
447 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 451 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
448 </if> 452 </if>
449 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 453 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
450 <if expr="enable_media_router"> 454 <if expr="enable_media_router">
451 <part file="media_router_resources.grdp" /> 455 <part file="media_router_resources.grdp" />
452 </if> 456 </if>
453 </includes> 457 </includes>
454 </release> 458 </release>
455 </grit> 459 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/md_downloads/compiled_resources.gyp » ('j') | ui/webui/resources/cr_elements/v1_0/cr_search_field/cr_search_field.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698