chrome/browser/browser_resources.grd - Issue 211036: Linux: Remove linux splash page and printing command line switch....

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

Issue 211036: Linux: Remove linux splash page and printing command line switch.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 3 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 | « chrome/browser/browser_init.cc ('k') | chrome/browser/resources/linux-splash.html » ('j') | no next file with comments »

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <!-- This comment is only here because changes to resources are not picked up	2 <!-- This comment is only here because changes to resources are not picked up

3 without changes to the corresponding grd file. fb03 -->	3 without changes to the corresponding grd file. fb03 -->

4 <grit latest_public_release="0" current_release="1">	4 <grit latest_public_release="0" current_release="1">

5 <outputs>	5 <outputs>

6 <output filename="grit/browser_resources.h" type="rc_header">	6 <output filename="grit/browser_resources.h" type="rc_header">

7 <emit emit_type='prepend'></emit>	7 <emit emit_type='prepend'></emit>

8 </output>	8 </output>

9 <output filename="browser_resources.rc" type="rc_all" />	9 <output filename="browser_resources.rc" type="rc_all" />

10 <output filename="browser_resources.pak" type="data_package" />	10 <output filename="browser_resources.pak" type="data_package" />

(...skipping 27 matching lines...) Expand all Loading...
38 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />	38 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />

39 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" />	39 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" />

40 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" />	40 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" />

41 <include name="IDR_LOCAL_STRINGS_JS" file="resources\local_strings.js" typ e="BINDATA" />	41 <include name="IDR_LOCAL_STRINGS_JS" file="resources\local_strings.js" typ e="BINDATA" />

42 <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="tr ue" type="BINDATA" />	42 <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="tr ue" type="BINDATA" />

43 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />	43 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />

44 <include name="IDR_EXTENSIONS_TOOLSTRIP_CSS" file="resources\extensions_to olstrip.css" flattenhtml="true" type="BINDATA" />	44 <include name="IDR_EXTENSIONS_TOOLSTRIP_CSS" file="resources\extensions_to olstrip.css" flattenhtml="true" type="BINDATA" />

45 <include name="IDR_PRINT_TAB_HTML" file="resources\print_tab.html" flatten html="true" type="BINDATA" />	45 <include name="IDR_PRINT_TAB_HTML" file="resources\print_tab.html" flatten html="true" type="BINDATA" />

46 <include name="IDR_PRINT_TAB_CSS" file="resources\print_tab.css" type="BIN DATA" />	46 <include name="IDR_PRINT_TAB_CSS" file="resources\print_tab.css" type="BIN DATA" />

47 <include name="IDR_PRINT_TAB_JS" file="resources\print_tab.js" type="BINDA TA" />	47 <include name="IDR_PRINT_TAB_JS" file="resources\print_tab.js" type="BINDA TA" />

48 <if expr="os == 'linux2'">

49 <include name="IDR_LINUX_SPLASH_HTML_CHROMIUM" file="resources\linux-spl ash.html" flattenhtml="true" type="BINDATA" />

50 <include name="IDR_LINUX_SPLASH_HTML_CHROME" file="resources\linux-splas h-chrome.html" flattenhtml="true" type="BINDATA" />

51 </if>

52 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" />	48 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" />

53 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />	49 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />

54 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />	50 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />

55 <include name="IDR_MERGE_AND_SYNC_HTML" file="sync\resources\merge_and_syn c.html" flattenhtml="true" type="BINDATA" />	51 <include name="IDR_MERGE_AND_SYNC_HTML" file="sync\resources\merge_and_syn c.html" flattenhtml="true" type="BINDATA" />

56 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" />	52 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" />

57 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" />	53 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" />

58 <include name="IDR_DEFAULT_EXTENSION_ICON_128" file="resources\default_ext ension_icon_128.png" type="BINDATA" />	54 <include name="IDR_DEFAULT_EXTENSION_ICON_128" file="resources\default_ext ension_icon_128.png" type="BINDATA" />

59 </includes>	55 </includes>

60 </release>	56 </release>

61 </grit>	57 </grit>

OLD	NEW