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

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

Issue 587803003: [Search] Add a header image to the promo flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 12 matching lines...) Expand all
23 <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_a ndroid\about_welcome_android.html" flattenhtml="true" type="chrome_html" /> 23 <structure name="IDR_ABOUT_WELCOME_HTML" file="resources\about_welcome_a ndroid\about_welcome_android.html" flattenhtml="true" type="chrome_html" />
24 </if> 24 </if>
25 <if expr="enable_app_list"> 25 <if expr="enable_app_list">
26 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" /> 26 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" />
27 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" /> 27 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" />
28 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" /> 28 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" />
29 <structure name="IDR_APP_LIST_HOTWORD_NACL_NMF" file="resources\app_list \hotword_nacl.nmf" flattenhtml="true" type="chrome_html" /> 29 <structure name="IDR_APP_LIST_HOTWORD_NACL_NMF" file="resources\app_list \hotword_nacl.nmf" flattenhtml="true" type="chrome_html" />
30 </if> 30 </if>
31 <if expr="is_android"> 31 <if expr="is_android">
32 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex tual_search\promo.css" flattenhtml="true" type="chrome_html" /> 32 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex tual_search\promo.css" flattenhtml="true" type="chrome_html" />
33 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte xtual_search\promo.html" flattenhtml="true" type="chrome_html" /> 33 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte xtual_search\promo.html" flattenhtml="true" type="chrome_html" allowexternalscri pt="true" />
pedro (no code reviews) 2014/09/23 08:44:31 Do we need the allowexternalscript="true"?
Mathieu 2014/09/23 13:36:11 Done.
34 </if> 34 </if>
35 <if expr="chromeos"> 35 <if expr="chromeos">
36 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" /> 36 <structure name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\logi n\demo_user_login.html" flattenhtml="true" type="chrome_html" />
37 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" /> 37 <structure name="IDR_DEMO_USER_LOGIN_JS" file="resources\chromeos\login\ demo_user_login.js" flattenhtml="true" type="chrome_html" />
38 </if> 38 </if>
39 <if expr="not is_android"> 39 <if expr="not is_android">
40 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads. css" flattenhtml="true" type="chrome_html" /> 40 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads. css" flattenhtml="true" type="chrome_html" />
41 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads .html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 41 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads .html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
42 </if> 42 </if>
43 <if expr="enable_extensions"> 43 <if expr="enable_extensions">
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 108 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
109 <if expr="is_posix and not is_macosx and not is_ios"> 109 <if expr="is_posix and not is_macosx and not is_ios">
110 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 110 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
111 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 111 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
112 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 112 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
113 </if> 113 </if>
114 <if expr="enable_app_list"> 114 <if expr="enable_app_list">
115 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" /> 115 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
116 </if> 116 </if>
117 <if expr="is_android"> 117 <if expr="is_android">
118 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_JS" file="resources\contextua l_search\promo.js" type="BINDATA" /> 118 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_JS" file="resources\contextua l_search\promo.js" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_HEADER_SVG" file="resources\c ontextual_search\header.svg" type="BINDATA" />
119 </if> 120 </if>
120 <if expr="enable_printing"> 121 <if expr="enable_printing">
121 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 122 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
122 </if> 123 </if>
123 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 124 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
124 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 125 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
125 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" /> 126 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" />
126 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 127 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
127 <if expr="not is_ios"> 128 <if expr="not is_ios">
128 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/> 129 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/>
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 439 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
439 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 440 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
440 </if> 441 </if>
441 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 442 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
442 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 443 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
443 </if> 444 </if>
444 <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" />
445 </includes> 446 </includes>
446 </release> 447 </release>
447 </grit> 448 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698