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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 734243003: Adding the chrome://copresence page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@state
Patch Set: Fixing compile errors Created 6 years 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/copresence.css » ('j') | chrome/browser/ui/webui/copresence_ui_handler.cc » ('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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
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" flattenhtml="true" 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 <include name="IDR_CONTEXTUAL_SEARCH_PROMO_HEADER_SVG" file="resources\c ontextual_search\header.svg" type="BINDATA" />
120 </if> 120 </if>
121 <if expr="not is_android and not is_ios">
122 <include name="IDR_COPRESENCE_CSS" file="resources\copresence.css" type= "BINDATA" />
123 <include name="IDR_COPRESENCE_HTML" file="resources\copresence.html" typ e="BINDATA" />
124 <include name="IDR_COPRESENCE_JS" file="resources\copresence.js" type="B INDATA" />
125 </if>
121 <if expr="enable_printing"> 126 <if expr="enable_printing">
122 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 127 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
123 </if> 128 </if>
124 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 129 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
125 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 130 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
126 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" /> 131 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" />
127 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 132 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
128 <if expr="not is_ios"> 133 <if expr="not is_ios">
129 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/> 134 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/>
130 </if> 135 </if>
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 447 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
443 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 448 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
444 </if> 449 </if>
445 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 450 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
446 <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" />
447 </if> 452 </if>
448 <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" />
449 </includes> 454 </includes>
450 </release> 455 </release>
451 </grit> 456 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/copresence.css » ('j') | chrome/browser/ui/webui/copresence_ui_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698