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

Side by Side Diff: extensions/renderer/resources/extensions_renderer_resources.grd

Issue 1131043003: Revert 2.5 CLs that relate to pulling Extension port management out of messaging.js. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert test Created 5 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
« no previous file with comments | « extensions/renderer/dispatcher.cc ('k') | extensions/renderer/resources/messaging.js » ('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/extensions_renderer_resources.h" type="rc_header"> 4 <output filename="grit/extensions_renderer_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="extensions_renderer_resources.pak" type="data_package" /> 7 <output filename="extensions_renderer_resources.pak" type="data_package" />
8 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <includes> 10 <includes>
(...skipping 24 matching lines...) Expand all
35 <include name="IDR_GUEST_VIEW_EVENTS_JS" file="guest_view/guest_view_event s.js" type="BINDATA" /> 35 <include name="IDR_GUEST_VIEW_EVENTS_JS" file="guest_view/guest_view_event s.js" type="BINDATA" />
36 <include name="IDR_IMAGE_UTIL_JS" file="image_util.js" type="BINDATA" /> 36 <include name="IDR_IMAGE_UTIL_JS" file="image_util.js" type="BINDATA" />
37 <include name="IDR_JSON_SCHEMA_JS" file="json_schema.js" type="BINDATA" /> 37 <include name="IDR_JSON_SCHEMA_JS" file="json_schema.js" type="BINDATA" />
38 <include name="IDR_KEEP_ALIVE_JS" file="keep_alive.js" type="BINDATA" /> 38 <include name="IDR_KEEP_ALIVE_JS" file="keep_alive.js" type="BINDATA" />
39 <include name="IDR_KEEP_ALIVE_MOJOM_JS" file="${mojom_root}\extensions\com mon\mojo\keep_alive.mojom.js" use_base_dir="false" type="BINDATA" /> 39 <include name="IDR_KEEP_ALIVE_MOJOM_JS" file="${mojom_root}\extensions\com mon\mojo\keep_alive.mojom.js" use_base_dir="false" type="BINDATA" />
40 <include name="IDR_LAST_ERROR_JS" file="last_error.js" type="BINDATA" /> 40 <include name="IDR_LAST_ERROR_JS" file="last_error.js" type="BINDATA" />
41 <include name="IDR_MESSAGING_JS" file="messaging.js" type="BINDATA" /> 41 <include name="IDR_MESSAGING_JS" file="messaging.js" type="BINDATA" />
42 <include name="IDR_MESSAGING_UTILS_JS" file="messaging_utils.js" type="BIN DATA" /> 42 <include name="IDR_MESSAGING_UTILS_JS" file="messaging_utils.js" type="BIN DATA" />
43 <include name="IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS" file="mime_han dler_private_custom_bindings.js" type="BINDATA" /> 43 <include name="IDR_MIME_HANDLER_PRIVATE_CUSTOM_BINDINGS_JS" file="mime_han dler_private_custom_bindings.js" type="BINDATA" />
44 <include name="IDR_MIME_HANDLER_MOJOM_JS" file="${mojom_root}\extensions\c ommon\api\mime_handler.mojom.js" use_base_dir="false" type="BINDATA" /> 44 <include name="IDR_MIME_HANDLER_MOJOM_JS" file="${mojom_root}\extensions\c ommon\api\mime_handler.mojom.js" use_base_dir="false" type="BINDATA" />
45 <include name="IDR_PORT_JS" file="port.js" type="BINDATA" />
46 <include name="IDR_SCHEMA_UTILS_JS" file="schema_utils.js" type="BINDATA" /> 45 <include name="IDR_SCHEMA_UTILS_JS" file="schema_utils.js" type="BINDATA" />
47 <include name="IDR_SEND_REQUEST_JS" file="send_request.js" type="BINDATA" /> 46 <include name="IDR_SEND_REQUEST_JS" file="send_request.js" type="BINDATA" />
48 <include name="IDR_SERIAL_CUSTOM_BINDINGS_JS" file="serial_custom_bindings .js" type="BINDATA" /> 47 <include name="IDR_SERIAL_CUSTOM_BINDINGS_JS" file="serial_custom_bindings .js" type="BINDATA" />
49 <include name="IDR_SERIAL_MOJOM_JS" file="${mojom_root}\device\serial\seri al.mojom.js" use_base_dir="false" type="BINDATA" /> 48 <include name="IDR_SERIAL_MOJOM_JS" file="${mojom_root}\device\serial\seri al.mojom.js" use_base_dir="false" type="BINDATA" />
50 <include name="IDR_SERIAL_SERIALIZATION_MOJOM_JS" file="${mojom_root}\devi ce\serial\serial_serialization.mojom.js" use_base_dir="false" type="BINDATA" /> 49 <include name="IDR_SERIAL_SERIALIZATION_MOJOM_JS" file="${mojom_root}\devi ce\serial\serial_serialization.mojom.js" use_base_dir="false" type="BINDATA" />
51 <include name="IDR_SERIAL_SERVICE_JS" file="serial_service.js" type="BINDA TA" /> 50 <include name="IDR_SERIAL_SERVICE_JS" file="serial_service.js" type="BINDA TA" />
52 <include name="IDR_SET_ICON_JS" file="set_icon.js" type="BINDATA" /> 51 <include name="IDR_SET_ICON_JS" file="set_icon.js" type="BINDATA" />
53 <include name="IDR_STASH_CLIENT_JS" file="stash_client.js" type="BINDATA" /> 52 <include name="IDR_STASH_CLIENT_JS" file="stash_client.js" type="BINDATA" />
54 <include name="IDR_STASH_MOJOM_JS" file="${mojom_root}\extensions\common\m ojo\stash.mojom.js" use_base_dir="false" type="BINDATA" /> 53 <include name="IDR_STASH_MOJOM_JS" file="${mojom_root}\extensions\common\m ojo\stash.mojom.js" use_base_dir="false" type="BINDATA" />
55 <include name="IDR_SURFACE_VIEW_JS" file="guest_view/surface_view/surface_ view.js" type="BINDATA" /> 54 <include name="IDR_SURFACE_VIEW_JS" file="guest_view/surface_view/surface_ view.js" type="BINDATA" />
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 93
95 <!-- Extension styles. --> 94 <!-- Extension styles. -->
96 <include name="IDR_EXTENSION_FONTS_CSS" file="extension_fonts.css" type="B INDATA"/> 95 <include name="IDR_EXTENSION_FONTS_CSS" file="extension_fonts.css" type="B INDATA"/>
97 </includes> 96 </includes>
98 <structures> 97 <structures>
99 <!-- Extension styles. --> 98 <!-- Extension styles. -->
100 <structure name="IDR_EXTENSION_CSS" file="extension.css" type="chrome_html " flattenhtml="true" /> 99 <structure name="IDR_EXTENSION_CSS" file="extension.css" type="chrome_html " flattenhtml="true" />
101 </structures> 100 </structures>
102 </release> 101 </release>
103 </grit> 102 </grit>
OLDNEW
« no previous file with comments | « extensions/renderer/dispatcher.cc ('k') | extensions/renderer/resources/messaging.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698