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

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

Issue 15812004: Remove the Activity Log UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/activity_log/activity_log.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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" /> 107 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" />
108 </if> 108 </if>
109 <if expr="is_macosx"> 109 <if expr="is_macosx">
110 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 110 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
111 </if> 111 </if>
112 <if expr="not is_macosx"> 112 <if expr="not is_macosx">
113 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 113 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
114 </if> 114 </if>
115 <if expr="not is_android"> 115 <if expr="not is_android">
116 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 116 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
117 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\e xtension_activity.html" flattenhtml="true" type="BINDATA" />
118 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\ext ension_activity.js" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" /> 117 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" />
120 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" /> 118 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" />
121 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" /> 119 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" />
122 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 120 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
123 </if> 121 </if>
124 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 122 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
125 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 123 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
126 <if expr="not is_android"> 124 <if expr="not is_android">
127 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html " flattenhtml="true" type="BINDATA" /> 125 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html " flattenhtml="true" type="BINDATA" />
128 </if> 126 </if>
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 356 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
359 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" /> 357 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
360 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 358 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
361 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 359 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
362 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 360 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
363 361
364 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 362 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
365 </includes> 363 </includes>
366 </release> 364 </release>
367 </grit> 365 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/activity_log/activity_log.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698