chrome/browser/browser_resources.grd - Issue 2401853005: Adding client code for new Windows 10 First Run Experience

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

Issue 2401853005: Adding client code for new Windows 10 First Run Experience (Closed)

Patch Set: Second round Created 4 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:

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" output_all_resource_defines= "false">	2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">

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 </outputs>	8 </outputs>

9 <release seq="1">	9 <release seq="1">

10 <structures>	10 <structures>

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" />	70 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML" file="resources\ chromeos\quick_unlock\pin_keyboard.html" flattenhtml="true" allowexternalscript= "true" type="chrome_html" />

71 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" />	71 <structure name="IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS" file="resources\ch romeos\quick_unlock\pin_keyboard.js" type="chrome_html" />

72 </if>	72 </if>

73 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />	73 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />

74 <structure name="IDR_SIGNIN_SHARED_CSS_HTML" file="resources\signin\signin _shared_css.html" preprocess="true" allowexternalscript="true" type="chrome_html " />	74 <structure name="IDR_SIGNIN_SHARED_CSS_HTML" file="resources\signin\signin _shared_css.html" preprocess="true" allowexternalscript="true" type="chrome_html " />

75 <if expr="not is_android and not is_ios and not chromeos">	75 <if expr="not is_android and not is_ios and not chromeos">

76 <structure name="IDR_WELCOME_CSS" file="resources\welcome\welcome.css" t ype="chrome_html" preprocess="true"/>	76 <structure name="IDR_WELCOME_CSS" file="resources\welcome\welcome.css" t ype="chrome_html" preprocess="true"/>

77 <structure name="IDR_WELCOME_HTML" file="resources\welcome\welcome.html" type="chrome_html" preprocess="true"/>	77 <structure name="IDR_WELCOME_HTML" file="resources\welcome\welcome.html" type="chrome_html" preprocess="true"/>

78 <structure name="IDR_WELCOME_JS" file="resources\welcome\welcome.js" typ e="chrome_html" preprocess="true"/>	78 <structure name="IDR_WELCOME_JS" file="resources\welcome\welcome.js" typ e="chrome_html" preprocess="true"/>

79 </if>	79 </if>

	80 <if expr="is_win">

	81 <structure name="IDR_WELCOME_WIN10_DEFAULT_BROWSER_JS" file="resources\w elcome\win10\default-browser.js" type="chrome_html" preprocess="true"/>
	michaelpg 2016/10/16 23:09:17 most of these don't need preprocess="true", unless most of these don't need preprocess="true", unless they use <if> type expressions (or you want to inline URLs in css maybe?) Patrick Monette 2016/10/19 23:46:59 Removed. Show quoted text On 2016/10/16 23:09:17, michaelpg wrote: > most of these don't need preprocess="true", unless they use <if> type > expressions (or you want to inline URLs in css maybe?) Removed.
	82 <structure name="IDR_WELCOME_WIN10_INLINE_COMBINED_HTML" file="resources \welcome\win10\inline\combined.html" type="chrome_html" preprocess="true"/>

	83 <structure name="IDR_WELCOME_WIN10_INLINE_CSS" file="resources\welcome\w in10\inline\welcome.css" type="chrome_html" preprocess="true"/>

	84 <structure name="IDR_WELCOME_WIN10_INLINE_DEFAULT_HTML" file="resources\ welcome\win10\inline\default.html" type="chrome_html" preprocess="true"/>

	85 <structure name="IDR_WELCOME_WIN10_JS" file="resources\welcome\win10\wel come-win10.js" type="chrome_html" preprocess="true"/>

	86 <structure name="IDR_WELCOME_WIN10_SECTIONED_COMBINED_HTML" file="resour ces\welcome\win10\sectioned\combined.html" type="chrome_html" preprocess="true"/ >

	87 <structure name="IDR_WELCOME_WIN10_SECTIONED_CSS" file="resources\welcom e\win10\sectioned\welcome.css" type="chrome_html" preprocess="true"/>

	88 <structure name="IDR_WELCOME_WIN10_SECTIONED_DEFAULT_HTML" file="resourc es\welcome\win10\sectioned\default.html" type="chrome_html" preprocess="true"/>

	89 <structure name="IDR_WELCOME_WIN10_TASKBAR_PIN_JS" file="resources\welco me\win10\taskbar-pin.js" type="chrome_html" preprocess="true"/>

	90 <structure name="IDR_WELCOME_WIN10_TOGGLE_SCREENSHOT_JS" file="resources \welcome\win10\toggle-screenshot.js" type="chrome_html" preprocess="true"/>

	91 <structure name="IDR_WELCOME_WIN10_TOGGLE_SECTION_JS" file="resources\we lcome\win10\toggle-section.js" type="chrome_html" preprocess="true"/>

	92 </if>

80 </structures>	93 </structures>

81 <includes>	94 <includes>

82 <if expr="is_win">	95 <if expr="is_win">

83 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />	96 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

84 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />	97 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />

85 </if>	98 </if>

86 <if expr="enable_plugins">	99 <if expr="enable_plugins">

87 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />	100 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />

88 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />	101 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />

89 </if>	102 </if>

(...skipping 502 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
592 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />	605 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />

593 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />	606 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />

594 </if>	607 </if>

595 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="chrome_c ontent_browser_manifest_overlay.json" type="BINDATA" />	608 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="chrome_c ontent_browser_manifest_overlay.json" type="BINDATA" />

596 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />	609 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />

597 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />	610 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />

598 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />	611 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />

599 </includes>	612 </includes>

600 </release>	613 </release>

601 </grit>	614 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/resources/welcome/win10/default-browser.js » ('j') | chrome/browser/resources/welcome/win10/default-browser.js » ('J')