Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10388253: Revert 138502 - Move version metadata from PluginGroup into PluginInstaller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" /> 83 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />
84 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 84 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
85 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 85 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
86 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 86 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
87 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 87 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
88 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 88 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
89 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 89 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
90 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 90 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
91 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" /> 91 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />
92 <if expr="is_win"> 92 <if expr="is_win">
93 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 93 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_win.json" typ e="BINDATA" />
94 </if> 94 </if>
95 <if expr="is_macosx"> 95 <if expr="is_macosx">
96 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" /> 96 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_mac.json" typ e="BINDATA" />
97 </if> 97 </if>
98 <if expr="is_linux"> 98 <if expr="is_linux">
99 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_linux.json" type="BINDATA" /> 99 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_linux.json" t ype="BINDATA" />
100 </if> 100 </if>
101 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ > 101 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ >
102 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 102 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
103 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 103 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
104 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 104 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
105 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" /> 105 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />
106 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 106 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
107 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 107 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
108 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" /> 108 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />
109 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 109 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 184 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
185 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 185 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
186 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 186 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
187 </if> 187 </if>
188 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 188 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
189 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 189 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
190 </if> 190 </if>
191 </includes> 191 </includes>
192 </release> 192 </release>
193 </grit> 193 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698