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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9234076: Implementation of the Extension Activity Log UI behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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/resources/extensions/extension_activity.css » ('j') | chrome/browser/resources/extensions/extension_activity.css » ('J')
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 <include name="IDR_EDIT_SEARCH_ENGINE_DIALOG_CSS" file="resources\edit_sea rch_engine_dialog.css" type="BINDATA" /> 48 <include name="IDR_EDIT_SEARCH_ENGINE_DIALOG_CSS" file="resources\edit_sea rch_engine_dialog.css" type="BINDATA" />
49 <include name="IDR_EDIT_SEARCH_ENGINE_DIALOG_HTML" file="resources\edit_se arch_engine_dialog.html" type="BINDATA" /> 49 <include name="IDR_EDIT_SEARCH_ENGINE_DIALOG_HTML" file="resources\edit_se arch_engine_dialog.html" type="BINDATA" />
50 <include name="IDR_EDIT_SEARCH_ENGINE_DIALOG_JS" file="resources\edit_sear ch_engine_dialog.js" type="BINDATA" /> 50 <include name="IDR_EDIT_SEARCH_ENGINE_DIALOG_JS" file="resources\edit_sear ch_engine_dialog.js" type="BINDATA" />
51 <if expr="is_macosx"> 51 <if expr="is_macosx">
52 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 52 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
53 </if> 53 </if>
54 <if expr="not is_macosx"> 54 <if expr="not is_macosx">
55 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 55 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
56 </if> 56 </if>
57 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension _list.js" flattenhtml="true" type="BINDATA" /> 57 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension _list.js" flattenhtml="true" type="BINDATA" />
58 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext ension_activity.html" flattenhtml="true" type="BINDATA" />
59 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\exten sion_activity.js" flattenhtml="true" type="BINDATA" />
58 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions. html" flattenhtml="true" type="BINDATA" /> 60 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions. html" flattenhtml="true" type="BINDATA" />
59 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js " flattenhtml="true" type="BINDATA" /> 61 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js " flattenhtml="true" type="BINDATA" />
60 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 62 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
61 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> 63 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
62 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 64 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
63 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 65 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
64 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" /> 66 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" />
65 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 67 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
66 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" /> 68 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" />
67 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 69 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 179 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
178 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 180 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
179 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 181 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
180 </if> 182 </if>
181 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 183 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
182 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 184 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
183 </if> 185 </if>
184 </includes> 186 </includes>
185 </release> 187 </release>
186 </grit> 188 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/resources/extensions/extension_activity.css » ('j') | chrome/browser/resources/extensions/extension_activity.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698