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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/renderer/resources/renderer_resources.grd

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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
« chrome/browser/instant/instant_web_contents_container.h ('K') | « chrome/renderer/resources/extensions/searchbox_api.js ('k') | chrome/renderer/searchbox/searchbox.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. fb9 --> 3 without changes to the corresponding grd file. fb9 -->
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/renderer_resources.h" type="rc_header" context="defau lt_100_percent"> 6 <output filename="grit/renderer_resources.h" type="rc_header" context="defau lt_100_percent">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/renderer_resources_map.cc" type="resource_map_source" context="default_100_percent" /> 9 <output filename="grit/renderer_resources_map.cc" type="resource_map_source" context="default_100_percent" />
10 <output filename="grit/renderer_resources_map.h" type="resource_map_header" context="default_100_percent" /> 10 <output filename="grit/renderer_resources_map.h" type="resource_map_header" context="default_100_percent" />
11 <output filename="renderer_resources_100_percent.pak" type="data_package" co ntext="default_100_percent" /> 11 <output filename="renderer_resources_100_percent.pak" type="data_package" co ntext="default_100_percent" />
12 <output filename="renderer_resources_200_percent.pak" type="data_package" co ntext="default_200_percent" /> 12 <output filename="renderer_resources_200_percent.pak" type="data_package" co ntext="default_200_percent" />
13 </outputs> 13 </outputs>
14 <release seq="1"> 14 <release seq="1">
15 <structures fallback_to_low_resolution="true"> 15 <structures fallback_to_low_resolution="true">
16 <structure type="chrome_scaled_image" name="IDR_SAD_WEBVIEW" file="common\ webview-crash.png" /> 16 <structure type="chrome_scaled_image" name="IDR_SAD_WEBVIEW" file="common\ webview-crash.png" />
17 <structure type="chrome_scaled_image" name="IDR_SAD_PLUGIN" file="common\s adplugin.png" /> 17 <structure type="chrome_scaled_image" name="IDR_SAD_PLUGIN" file="common\s adplugin.png" />
18 </structures> 18 </structures>
19 <includes> 19 <includes>
20 <if expr="pp_ifdef('android')"> 20 <if expr="pp_ifdef('android')">
21 <include name="IDR_MOBILE_YOUTUBE_PLUGIN_HTML" file="mobile_youtube_plug in.html" flattenhtml="true" type="BINDATA" /> 21 <include name="IDR_MOBILE_YOUTUBE_PLUGIN_HTML" file="mobile_youtube_plug in.html" flattenhtml="true" type="BINDATA" />
22 </if> 22 </if>
23 <include name="IDR_BLOCKED_PLUGIN_HTML" file="blocked_plugin.html" flatten html="true" type="BINDATA" /> 23 <include name="IDR_BLOCKED_PLUGIN_HTML" file="blocked_plugin.html" flatten html="true" type="BINDATA" />
24 <include name="IDR_CLICK_TO_PLAY_PLUGIN_HTML" file="click_to_play_plugin.h tml" flattenhtml="true" type="BINDATA" /> 24 <include name="IDR_CLICK_TO_PLAY_PLUGIN_HTML" file="click_to_play_plugin.h tml" flattenhtml="true" type="BINDATA" />
25 <include name="IDR_CONTENT_WATCHER_JS" file="extensions\content_watcher.js " type="BINDATA" /> 25 <include name="IDR_CONTENT_WATCHER_JS" file="extensions\content_watcher.js " type="BINDATA" />
26 <include name="IDR_DISABLED_PLUGIN_HTML" file="disabled_plugin.html" flatt enhtml="true" type="BINDATA" /> 26 <include name="IDR_DISABLED_PLUGIN_HTML" file="disabled_plugin.html" flatt enhtml="true" type="BINDATA" />
27 <include name="IDR_EMBEDDED_SEARCHBOX_API" file="extensions\embedded_searc hbox_api.js" type="BINDATA" />
27 <include name="IDR_ERROR_APP_HTML" file="error_app.html" flattenhtml="true " type="BINDATA" /> 28 <include name="IDR_ERROR_APP_HTML" file="error_app.html" flattenhtml="true " type="BINDATA" />
28 <include name="IDR_EVENT_BINDINGS_JS" file="extensions\event.js" type="BIN DATA" /> 29 <include name="IDR_EVENT_BINDINGS_JS" file="extensions\event.js" type="BIN DATA" />
29 <include name="IDR_EXTENSION_APITEST_JS" file="extensions\apitest.js" type ="BINDATA" /> 30 <include name="IDR_EXTENSION_APITEST_JS" file="extensions\apitest.js" type ="BINDATA" />
30 <include name="IDR_GREASEMONKEY_API_JS" file="extensions\greasemonkey_api. js" type="BINDATA" /> 31 <include name="IDR_GREASEMONKEY_API_JS" file="extensions\greasemonkey_api. js" type="BINDATA" />
31 <include name="IDR_SEARCHBOX_API" file="extensions\searchbox_api.js" type= "BINDATA" /> 32 <include name="IDR_SEARCHBOX_API" file="extensions\searchbox_api.js" type= "BINDATA" />
32 <include name="IDR_JSON_JS" file="extensions\json.js" type="BINDATA" /> 33 <include name="IDR_JSON_JS" file="extensions\json.js" type="BINDATA" />
33 <include name="IDR_JSON_SCHEMA_JS" file="extensions\json_schema.js" type=" BINDATA" /> 34 <include name="IDR_JSON_SCHEMA_JS" file="extensions\json_schema.js" type=" BINDATA" />
34 <include name="IDR_MISCELLANEOUS_BINDINGS_JS" file="extensions\miscellaneo us_bindings.js" type="BINDATA" /> 35 <include name="IDR_MISCELLANEOUS_BINDINGS_JS" file="extensions\miscellaneo us_bindings.js" type="BINDATA" />
35 <include name="IDR_NET_ERROR_HTML" file="neterror.html" flattenhtml="true" type="BINDATA" /> 36 <include name="IDR_NET_ERROR_HTML" file="neterror.html" flattenhtml="true" type="BINDATA" />
36 <include name="IDR_SCHEMA_GENERATED_BINDINGS_JS" file="extensions\schema_g enerated_bindings.js" type="BINDATA" /> 37 <include name="IDR_SCHEMA_GENERATED_BINDINGS_JS" file="extensions\schema_g enerated_bindings.js" type="BINDATA" />
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" /> 88 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" />
88 89
89 <!-- Platform app support. --> 90 <!-- Platform app support. -->
90 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" /> 91 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" />
91 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" /> 92 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" />
92 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" /> 93 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" />
93 </if> 94 </if>
94 </includes> 95 </includes>
95 </release> 96 </release>
96 </grit> 97 </grit>
OLDNEW
« chrome/browser/instant/instant_web_contents_container.h ('K') | « chrome/renderer/resources/extensions/searchbox_api.js ('k') | chrome/renderer/searchbox/searchbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698