chrome/browser/browser_resources.grd - Issue 11014009: Beginnings of the script bubble.

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

Issue 11014009: Beginnings of the script bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ready to land 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

OLD	NEW
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 254 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
265 <if expr="pp_ifdef('chromeos')">	265 <if expr="pp_ifdef('chromeos')">

266 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" />	266 <include name="IDR_WALLPAPERMANAGER_MANIFEST" file="resources\chromeos\w allpaper_manager\manifest.json" type="BINDATA" />

267 </if>	267 </if>

268 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')" >	268 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_ash')" >

269 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />	269 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />

270 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />	270 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />

271 </if>	271 </if>

272 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">	272 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">

273 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />	273 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />

274 </if>	274 </if>

	275 <include name="IDR_SCRIPT_BUBBLE_MANIFEST" file="resources\script_bubble\m anifest.json" type="BINDATA" />

275 <if expr="pp_ifdef('use_ash')">	276 <if expr="pp_ifdef('use_ash')">

276 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" />	277 <include name="IDR_GESTURE_CONFIG_CSS" file="resources\gesture_config.cs s" type="BINDATA" />

277 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />	278 <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" />	279 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />

279 </if>	280 </if>

280 <if expr="is_win">	281 <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" />	282 <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 " />	283 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />

283 </if>	284 </if>

284 </includes>	285 </includes>

285 </release>	286 </release>

286 </grit>	287 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/extensions/component_loader.h » ('j') | no next file with comments »