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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1123313006: Revert of [Contextual Search] Remove opt-in code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java ('k') | chrome/browser/resources/contextual_search/OWNERS » ('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>
11 <if expr="not is_win and not is_macosx and not is_ios"> 11 <if expr="not is_win and not is_macosx and not is_ios">
12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" /> 12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
13 </if> 13 </if>
14 <if expr="is_macosx or is_ios"> 14 <if expr="is_macosx or is_ios">
15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" /> 15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
16 </if> 16 </if>
17 <if expr="is_win"> 17 <if expr="is_win">
18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" /> 18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
19 </if> 19 </if>
20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" /> 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" />
21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
22 <if expr="enable_app_list"> 22 <if expr="enable_app_list">
23 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" /> 23 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" />
24 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" /> 24 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" />
25 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" /> 25 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" />
26 </if> 26 </if>
27 <if expr="is_android">
28 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex tual_search\promo.css" flattenhtml="true" type="chrome_html" />
29 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte xtual_search\promo.html" flattenhtml="true" type="chrome_html" />
30 </if>
27 <if expr="not is_android"> 31 <if expr="not is_android">
28 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads. css" flattenhtml="true" type="chrome_html" /> 32 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads. css" flattenhtml="true" type="chrome_html" />
29 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads .html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 33 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads .html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
30 </if> 34 </if>
31 <if expr="enable_extensions"> 35 <if expr="enable_extensions">
32 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensi ons.html" flattenhtml="true" type="chrome_html" /> 36 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensi ons.html" flattenhtml="true" type="chrome_html" />
33 </if> 37 </if>
34 <if expr="chromeos"> 38 <if expr="chromeos">
35 <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\ first_run.html" flattenhtml="true" type="chrome_html"/> 39 <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\ first_run.html" flattenhtml="true" type="chrome_html"/>
36 <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\fi rst_run.js" flattenhtml="true" type="chrome_html" /> 40 <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\fi rst_run.js" flattenhtml="true" type="chrome_html" />
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ e="BINDATA" /> 103 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ e="BINDATA" />
100 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 104 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
101 <if expr="is_posix and not is_macosx and not is_ios"> 105 <if expr="is_posix and not is_macosx and not is_ios">
102 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 106 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
103 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 107 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
104 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 108 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
105 </if> 109 </if>
106 <if expr="enable_app_list"> 110 <if expr="enable_app_list">
107 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" /> 111 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
108 </if> 112 </if>
113 <if expr="is_android">
114 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_JS" file="resources\contextua l_search\promo.js" flattenhtml="true" type="BINDATA" />
115 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_HEADER_SVG" file="resources\c ontextual_search\header.svg" type="BINDATA" />
116 </if>
109 <if expr="not is_android and not is_ios"> 117 <if expr="not is_android and not is_ios">
110 <include name="IDR_COPRESENCE_CSS" file="resources\copresence.css" type= "BINDATA" /> 118 <include name="IDR_COPRESENCE_CSS" file="resources\copresence.css" type= "BINDATA" />
111 <include name="IDR_COPRESENCE_HTML" file="resources\copresence.html" typ e="BINDATA" /> 119 <include name="IDR_COPRESENCE_HTML" file="resources\copresence.html" typ e="BINDATA" />
112 <include name="IDR_COPRESENCE_JS" file="resources\copresence.js" type="B INDATA" /> 120 <include name="IDR_COPRESENCE_JS" file="resources\copresence.js" type="B INDATA" />
113 </if> 121 </if>
114 <if expr="enable_printing"> 122 <if expr="enable_printing">
115 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 123 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
116 </if> 124 </if>
117 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 125 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
118 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 126 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 </if> 448 </if>
441 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 449 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
442 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" /> 450 <include name="IDR_MD_SETTINGS_UI_HTML" file="resources\md_settings\md_set tings.html" type="BINDATA" />
443 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" /> 451 <include name="IDR_MD_SETTINGS_UI_CSS" file="resources\md_settings\md_sett ings.css" type="BINDATA" />
444 <if expr="enable_media_router"> 452 <if expr="enable_media_router">
445 <part file="media_router_resources.grdp" /> 453 <part file="media_router_resources.grdp" />
446 </if> 454 </if>
447 </includes> 455 </includes>
448 </release> 456 </release>
449 </grit> 457 </grit>
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchUma.java ('k') | chrome/browser/resources/contextual_search/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698