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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11967029: Initial implementation of Google Now Notifications integration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing presubmit check. Created 7 years, 10 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 | « build/common.gypi ('k') | chrome/browser/extensions/component_loader.cc » ('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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 file="resources\print_preview\images\mobile.png" type="BINDATA" /> 199 file="resources\print_preview\images\mobile.png" type="BINDATA" />
200 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED" 200 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED"
201 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" /> 201 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" />
202 </if> 202 </if>
203 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 203 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
204 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 204 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
205 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 205 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
206 <if expr="pp_ifdef('enable_settings_app')"> 206 <if expr="pp_ifdef('enable_settings_app')">
207 <include name="IDR_SETTINGS_APP_MANIFEST" file="resources\settings_app\m anifest.json" type="BINDATA" /> 207 <include name="IDR_SETTINGS_APP_MANIFEST" file="resources\settings_app\m anifest.json" type="BINDATA" />
208 </if> 208 </if>
209 <if expr="pp_ifdef('enable_google_now')">
210 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
211 </if>
209 <if expr="not pp_ifdef('android')"> 212 <if expr="not pp_ifdef('android')">
210 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" /> 213 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" />
211 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" /> 214 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" />
212 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" /> 215 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" />
213 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" /> 216 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" />
214 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" /> 217 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" />
215 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" /> 218 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" />
216 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" /> 219 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" />
217 </if> 220 </if>
218 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 221 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 314 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
312 </if> 315 </if>
313 <if expr="is_win"> 316 <if expr="is_win">
314 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 317 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
315 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 318 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
316 </if> 319 </if>
317 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 320 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
318 </includes> 321 </includes>
319 </release> 322 </release>
320 </grit> 323 </grit>
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698