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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11038014: [Android] Upstream remaining changes to NTP UI code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed indentation nit Created 8 years, 2 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/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | chrome/common/chrome_notification_types.h » ('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 <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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE" 173 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE"
174 file="resources\print_preview\images\mobile.png" type="BINDATA" /> 174 file="resources\print_preview\images\mobile.png" type="BINDATA" />
175 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED" 175 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED"
176 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" /> 176 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" />
177 </if> 177 </if>
178 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 178 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
179 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 179 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
180 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 180 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
181 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 181 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
182 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 182 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
183 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestions _internals\suggestions_internals.html" flattenhtml="true" allowexternalscript="t rue" type="BINDATA" />
184 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestions_ internals\suggestions_internals.css" type="BINDATA" />
185 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_i nternals\suggestions_internals.js" type="BINDATA" />
186 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_ page.css" type="BINDATA" />
187 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_p age.js" type="BINDATA" />
188 <if expr="not pp_ifdef('android')"> 183 <if expr="not pp_ifdef('android')">
184 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" />
185 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" />
186 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" />
187 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" />
188 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" />
189 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" /> 189 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" />
190 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" /> 190 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" />
191 </if> 191 </if>
192 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 192 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
193 <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 193 <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
194 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 194 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
195 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" /> 195 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" />
196 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 196 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
197 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 197 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
198 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 198 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 277 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
278 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 278 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
279 </if> 279 </if>
280 <if expr="is_win"> 280 <if expr="is_win">
281 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 281 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
282 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 282 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
283 </if> 283 </if>
284 </includes> 284 </includes>
285 </release> 285 </release>
286 </grit> 286 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | chrome/common/chrome_notification_types.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698