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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10383240: This adds a webui overlay on the extensions page for showing what Extension keybindings are active.… (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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/commands/extension_command_service.h » ('j') | chrome/browser/extensions/api/commands/extension_command_service.h » ('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 28 matching lines...) Expand all
39 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_prin t\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" /> 39 <include name="IDR_CLOUD_PRINT_SETUP_DONE_HTML" file="resources\cloud_prin t\cloud_print_setup_done.html" flattenhtml="true" type="BINDATA" />
40 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_prin t\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" /> 40 <include name="IDR_CLOUD_PRINT_SETUP_FLOW_HTML" file="resources\cloud_prin t\cloud_print_setup_flow.html" flattenhtml="true" type="BINDATA" />
41 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="resources\cloud_pri nt\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" /> 41 <include name="IDR_CLOUD_PRINT_SETUP_LOGIN_HTML" file="resources\cloud_pri nt\cloud_print_setup_login.html" flattenhtml="true" type="BINDATA" />
42 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 42 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
43 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 43 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
44 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 44 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
45 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 45 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
46 <include name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.css" flattenhtml="true" type="BINDATA" /> 46 <include name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads.css" flattenhtml="true" type="BINDATA" />
47 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 47 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads.htm l" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
48 <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" t ype="BINDATA" /> 48 <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" t ype="BINDATA" />
49 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions\e xtension_command_list.js" flattenhtml="true" type="BINDATA" />
49 <if expr="is_macosx"> 50 <if expr="is_macosx">
50 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 51 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
51 </if> 52 </if>
52 <if expr="not is_macosx"> 53 <if expr="not is_macosx">
53 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 54 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
54 </if> 55 </if>
55 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension _list.js" flattenhtml="true" type="BINDATA" /> 56 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extension _list.js" flattenhtml="true" type="BINDATA" />
56 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext ension_activity.html" flattenhtml="true" type="BINDATA" /> 57 <include name="IDR_EXTENSION_ACTIVITY_HTML" file="resources\extensions\ext ension_activity.html" flattenhtml="true" type="BINDATA" />
57 <include name="IDR_EXTENSION_ACTIVITY_JS" file="resources\extensions\exten sion_activity.js" flattenhtml="true" type="BINDATA" /> 58 <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" /> 59 <include name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensions. html" flattenhtml="true" type="BINDATA" />
(...skipping 125 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') "> 185 <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" /> 186 <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" /> 187 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
187 </if> 188 </if>
188 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 189 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
189 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 190 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
190 </if> 191 </if>
191 </includes> 192 </includes>
192 </release> 193 </release>
193 </grit> 194 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/commands/extension_command_service.h » ('j') | chrome/browser/extensions/api/commands/extension_command_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698