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

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

Issue 2862041: Remove abonded privacy blacklist implementation. (Closed)
Patch Set: fix unit tests Created 10 years, 5 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
« no previous file with comments | « chrome/browser/browser_prefs.cc ('k') | chrome/browser/net/chrome_url_request_context.h » ('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 <!-- 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. sew --> 3 without changes to the corresponding grd file. sew -->
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" />
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> 60 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />
61 <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_defau lt_icon.png" type="BINDATA" /> 61 <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_defau lt_icon.png" type="BINDATA" />
62 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_info bar.css" flattenhtml="true" type="BINDATA" /> 62 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_info bar.css" flattenhtml="true" type="BINDATA" />
63 <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensi ons_toolstrip.css" flattenhtml="true" type="BINDATA" /> 63 <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensi ons_toolstrip.css" flattenhtml="true" type="BINDATA" />
64 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" type="BINDATA" /> 64 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" type="BINDATA" />
65 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" /> 65 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" />
66 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 66 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
67 <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose _datatypes.html" flattenhtml="true" type="BINDATA" /> 67 <include name="IDR_SYNC_CHOOSE_DATATYPES_HTML" file="sync\resources\choose _datatypes.html" flattenhtml="true" type="BINDATA" />
68 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" /> 68 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />
69 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" /> 69 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />
70 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" />
71 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" />
72 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 70 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
73 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" type="BINDATA" /> 71 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" type="BINDATA" />
74 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" type="BINDATA" /> 72 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" type="BINDATA" />
75 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 73 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
76 </includes> 74 </includes>
77 </release> 75 </release>
78 </grit> 76 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/browser_prefs.cc ('k') | chrome/browser/net/chrome_url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698