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

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

Issue 9265020: [uber] make the navigation controls an iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: opt = Created 8 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/about_page/about_page.css » ('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 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" /> 117 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />
118 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" type="BINDATA" /> 118 <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.ht ml" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_TRACING_HTML" file="resources\tracing.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 119 <include name="IDR_TRACING_HTML" file="resources\tracing.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
120 <include name="IDR_TRACING_JS" file="resources\tracing.js" flattenhtml="tr ue" type="BINDATA" /> 120 <include name="IDR_TRACING_JS" file="resources\tracing.js" flattenhtml="tr ue" type="BINDATA" />
121 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 121 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
122 <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 122 <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
123 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 123 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
124 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" /> 124 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" />
125 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 125 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
126 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 126 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
127 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
128 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
129 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
127 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" /> 130 <include name="IDR_WEBSTORE_MANIFEST" file="resources\webstore_app\manifes t.json" type="BINDATA" />
128 <include name="IDR_ENTERPRISE_WEBSTORE_MANIFEST" file="resources\enterpris e_webstore_app\manifest.json" type="BINDATA" /> 131 <include name="IDR_ENTERPRISE_WEBSTORE_MANIFEST" file="resources\enterpris e_webstore_app\manifest.json" type="BINDATA" />
129 <if expr="not pp_ifdef('chromeos')"> 132 <if expr="not pp_ifdef('chromeos')">
130 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" /> 133 <include name="IDR_SYNC_PROMO_JS" file="resources\sync_promo\sync_promo. js" flattenhtml="true" type="BINDATA" />
131 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 134 <include name="IDR_SYNC_PROMO_HTML" file="resources\sync_promo\sync_prom o.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
132 </if> 135 </if>
133 <if expr="pp_ifdef('chromeos')"> 136 <if expr="pp_ifdef('chromeos')">
134 <include name="IDR_ABOUT_PAGE_HTML" file="resources\about_page\about_pag e.html" flattenhtml="true" type="BINDATA" /> 137 <include name="IDR_ABOUT_PAGE_HTML" file="resources\about_page\about_pag e.html" flattenhtml="true" type="BINDATA" />
135 <include name="IDR_ABOUT_PAGE_JS" file="resources\about_page\about_page. js" flattenhtml="true" type="BINDATA" /> 138 <include name="IDR_ABOUT_PAGE_JS" file="resources\about_page\about_page. js" flattenhtml="true" type="BINDATA" />
136 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" /> 139 <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.ht ml" flattenhtml="true" type="BINDATA" />
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 174 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
172 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 175 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
173 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 176 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
174 </if> 177 </if>
175 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 178 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
176 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 179 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
177 </if> 180 </if>
178 </includes> 181 </includes>
179 </release> 182 </release>
180 </grit> 183 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/about_page/about_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698