chrome/browser/browser_resources.grd - Issue 7794023: Convert chrome://extensions to a settings page within the options pages.

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

Issue 7794023: Convert chrome://extensions to a settings page within the options pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Someone modified .grd between uploads :) Created 9 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

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 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />	65 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

66 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />	66 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />

67 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" />	67 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" />

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

69 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />	69 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />

70 <include name="IDR_HISTORY2_JS" file="resources\history2.js" type="BINDATA " />	70 <include name="IDR_HISTORY2_JS" file="resources\history2.js" type="BINDATA " />

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

72 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />	72 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />

73 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" />	73 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" />

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

75 <if expr="not pp_ifdef('touchui')">	75 <!--if expr="not pp_ifdef('touchui')"-->
	Aaron Boodman 2011/08/31 18:22:44 Remove dead code? Remove dead code? Finnur 2011/08/31 20:22:01 Woops. That file isn't supposed to be here. I thou Woops. That file isn't supposed to be here. I thought I had removed it, guess not. On 2011/08/31 18:22:44, Aaron Boodman wrote: Show quoted text > Remove dead code?
76 <include name="IDR_NEW_TAB_HTML" file="resources\new_tab.html" flattenht ml="true" type="BINDATA" />	76 <include name="IDR_NEW_TAB_HTML" file="resources\new_tab.html" flattenht ml="true" type="BINDATA" />

77 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />	77 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />

78 </if>	78 <!--/if>

79 <if expr="pp_ifdef('touchui')">	79 <if expr="pp_ifdef('touchui')">

80 <include name="IDR_NEW_TAB_HTML" file="resources\touch_ntp\newtab.html" flattenhtml="true" type="BINDATA" />	80 <include name="IDR_NEW_TAB_HTML" file="resources\touch_ntp\newtab.html" flattenhtml="true" type="BINDATA" />

81 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\touch_ntp\newtab.c ss" flattenhtml="true" type="BINDATA" />	81 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\touch_ntp\newtab.c ss" flattenhtml="true" type="BINDATA" />

82 </if>	82 </if-->

83 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" />	83 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" />

84 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />	84 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />

85 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />	85 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />

86 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />	86 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />

87 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />	87 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />

88 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />	88 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />

89 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />	89 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />

90 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />	90 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />

91 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />	91 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />

92 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />	92 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
148 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />	148 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />

149 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />	149 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />

150 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />	150 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />

151 </if>	151 </if>

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

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

154 </if>	154 </if>

155 </includes>	155 </includes>

156 </release>	156 </release>

157 </grit>	157 </grit>

OLD	NEW