| 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. eter --> | 3 without changes to the corresponding grd file. eter --> |
| 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.pak" type="data_package" /> | 9 <output filename="browser_resources.pak" type="data_package" /> |
| 10 <output filename="browser_resources.rc" type="rc_all" /> | 10 <output filename="browser_resources.rc" type="rc_all" /> |
| 11 </outputs> | 11 </outputs> |
| 12 <release seq="1"> | 12 <release seq="1"> |
| 13 <includes> | 13 <includes> |
| 14 <if expr="os == 'linux2' or os.find('bsd') != -1"> | 14 <if expr="os == 'linux2' or os.find('bsd') != -1"> |
| 15 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux
.html" flattenhtml="true" type="BINDATA" /> | 15 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux
.html" flattenhtml="true" type="BINDATA" /> |
| 16 </if> | 16 </if> |
| 17 <if expr="os == 'darwin'"> | 17 <if expr="os == 'darwin'"> |
| 18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h
tml" flattenhtml="true" type="BINDATA" /> | 18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h
tml" flattenhtml="true" type="BINDATA" /> |
| 19 </if> | 19 </if> |
| 20 <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1"> | 20 <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1"> |
| 21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html"
flattenhtml="true" type="BINDATA" /> | 21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html"
flattenhtml="true" type="BINDATA" /> |
| 22 </if> | 22 </if> |
| 23 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla
ttenhtml="true" type="BINDATA" /> | 23 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla
ttenhtml="true" type="BINDATA" /> |
| 24 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html"
flattenhtml="true" type="BINDATA" /> | 24 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html"
flattenhtml="true" type="BINDATA" /> |
| 25 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html"
flattenhtml="true" type="BINDATA" /> | 25 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html"
flattenhtml="true" type="BINDATA" /> |
| 26 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma
nifest.json" type="BINDATA" /> | 26 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma
nifest.json" type="BINDATA" /> |
| 27 <include name="IDR_CALENDAR_APP_MANIFEST" file="resources\calendar_app\man
ifest.json" type="BINDATA" /> | |
| 28 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt
enhtml="true" type="BINDATA" /> | 27 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt
enhtml="true" type="BINDATA" /> |
| 29 <include name="IDR_DOCS_APP_MANIFEST" file="resources\docs_app\manifest.js
on" type="BINDATA" /> | |
| 30 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten
html="true" type="BINDATA" /> | 28 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten
html="true" type="BINDATA" /> |
| 31 <if expr="os == 'darwin'"> | 29 <if expr="os == 'darwin'"> |
| 32 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in
fobar_mac.css" flattenhtml="true" type="BINDATA" /> | 30 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in
fobar_mac.css" flattenhtml="true" type="BINDATA" /> |
| 33 </if> | 31 </if> |
| 34 <if expr="os != 'darwin'"> | 32 <if expr="os != 'darwin'"> |
| 35 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in
fobar.css" flattenhtml="true" type="BINDATA" /> | 33 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in
fobar.css" flattenhtml="true" type="BINDATA" /> |
| 36 </if> | 34 </if> |
| 37 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html"
flattenhtml="true" type="BINDATA" /> | 35 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html"
flattenhtml="true" type="BINDATA" /> |
| 38 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html"
flattenhtml="true" type="BINDATA" /> | 36 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html"
flattenhtml="true" type="BINDATA" /> |
| 39 <include name="IDR_GMAIL_APP_MANIFEST" file="resources\gmail_app\manifest.
json" type="BINDATA" /> | |
| 40 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml
="true" type="BINDATA" /> | 37 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml
="true" type="BINDATA" /> |
| 41 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht
ml="true" type="BINDATA" /> | 38 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht
ml="true" type="BINDATA" /> |
| 42 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html"
flattenhtml="true" type="BINDATA" /> | 39 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html"
flattenhtml="true" type="BINDATA" /> |
| 43 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js
on" type="BINDATA" /> | 40 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js
on" type="BINDATA" /> |
| 44 <include name="IDR_LABS_HTML" file="resources\labs.html" flattenhtml="true
" type="BINDATA" /> | 41 <include name="IDR_LABS_HTML" file="resources\labs.html" flattenhtml="true
" type="BINDATA" /> |
| 45 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn
ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> | 42 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn
ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> |
| 46 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla
ttenhtml="true" type="BINDATA" /> | 43 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla
ttenhtml="true" type="BINDATA" /> |
| 47 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f
lattenhtml="true" type="BINDATA" /> | 44 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f
lattenhtml="true" type="BINDATA" /> |
| 48 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1
line.html" flattenhtml="true" type="BINDATA" /> | 45 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1
line.html" flattenhtml="true" type="BINDATA" /> |
| 49 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2
line.html" flattenhtml="true" type="BINDATA" /> | 46 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2
line.html" flattenhtml="true" type="BINDATA" /> |
| (...skipping 25 matching lines...) Expand all Loading... |
| 75 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\mobile_setup.
html" flattenhtml="true" type="BINDATA" /> | 72 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\mobile_setup.
html" flattenhtml="true" type="BINDATA" /> |
| 76 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html"
flattenhtml="true" type="BINDATA" /> | 73 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html"
flattenhtml="true" type="BINDATA" /> |
| 77 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm
l" flattenhtml="true" type="BINDATA" /> | 74 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm
l" flattenhtml="true" type="BINDATA" /> |
| 78 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt
enhtml="true" type="BINDATA" /> | 75 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt
enhtml="true" type="BINDATA" /> |
| 79 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif
est.json" type="BINDATA" /> | 76 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif
est.json" type="BINDATA" /> |
| 80 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr
ue" type="BINDATA" /> | 77 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr
ue" type="BINDATA" /> |
| 81 </if> | 78 </if> |
| 82 </includes> | 79 </includes> |
| 83 </release> | 80 </release> |
| 84 </grit> | 81 </grit> |
| OLD | NEW |