chrome/browser/browser_resources.grd - Issue 164376: Merge 22613 - Apply theme to incognito NTP....

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

Issue 164376: Merge 22613 - Apply theme to incognito NTP.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/

Patch Set: Created 11 years, 4 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

Property Changes:

Modified: svn:mergeinfo
Merged /trunk/src/chrome/browser/browser_resources.grd:r22613

« no previous file with comments | « no previous file | chrome/browser/dom_ui/dom_ui_theme_source.h » ('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. aa1 -->	3 without changes to the corresponding grd file. aa1 -->

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" />

11 </outputs>	11 </outputs>

12 <release seq="1">	12 <release seq="1">

13 <includes>	13 <includes>

14 <include name="IDR_ABOUT_PLUGINS_HTML" file="resources\about_plugins.html" type="BINDATA" />	14 <include name="IDR_ABOUT_PLUGINS_HTML" file="resources\about_plugins.html" type="BINDATA" />

15 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" />	15 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" />

16 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" f lattenhtml="true" type="BINDATA" />	16 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" f lattenhtml="true" type="BINDATA" />

17 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" typ e="BINDATA" />	17 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" typ e="BINDATA" />

18 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadb lock.html" flattenhtml="true" type="BINDATA" />	18 <include name="IDR_SSL_ROAD_BLOCK_HTML" file="security\resources\ssl_roadb lock.html" flattenhtml="true" type="BINDATA" />

19 <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html " flattenhtml="true" type="BINDATA" />	19 <include name="IDR_SSL_ERROR_HTML" file="security\resources\ssl_error.html " flattenhtml="true" type="BINDATA" />

20 <include name="IDR_NEW_TAB_HTML" file="resources\new_tab.html" flattenhtml ="true" type="BINDATA" />	20 <include name="IDR_NEW_TAB_HTML" file="resources\new_tab.html" flattenhtml ="true" type="BINDATA" />

21 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" />	21 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" />

	22 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />

22 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" />	23 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" />

23 <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type= "BINDATA" />	24 <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type= "BINDATA" />

24 <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="B INDATA" />	25 <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="B INDATA" />

25 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />	26 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />

26 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />	27 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />

27 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />	28 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />

28 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />	29 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />

29 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />	30 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />

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

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

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

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

34 <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" />

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

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

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

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

39 <if expr="os == 'linux2'">	40 <if expr="os == 'linux2'">

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

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

42 </if>	43 </if>

43 </includes>	44 </includes>

44 </release>	45 </release>

45 </grit>	46 </grit>

OLD	NEW