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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12463015: Enable <adview> tag for packaged apps. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Merge fix. 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
« no previous file with comments | « chrome/renderer/resources/extensions/platform_app.css ('k') | chrome/test/data/extensions/platform_apps/ad_view/ad_network/ads/image315.png » ('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" />
(...skipping 27 matching lines...) Expand all
38 <include name="IDR_IMAGE_UTIL_JS" file="extensions\image_util.js" type="BI NDATA" /> 38 <include name="IDR_IMAGE_UTIL_JS" file="extensions\image_util.js" type="BI NDATA" />
39 <include name="IDR_LAST_ERROR_JS" file="extensions\last_error.js" type="BI NDATA" /> 39 <include name="IDR_LAST_ERROR_JS" file="extensions\last_error.js" type="BI NDATA" />
40 <include name="IDR_SCHEMA_UTILS_JS" file="extensions\schema_utils.js" type ="BINDATA" /> 40 <include name="IDR_SCHEMA_UTILS_JS" file="extensions\schema_utils.js" type ="BINDATA" />
41 <include name="IDR_SEND_REQUEST_JS" file="extensions\send_request.js" type ="BINDATA" /> 41 <include name="IDR_SEND_REQUEST_JS" file="extensions\send_request.js" type ="BINDATA" />
42 <include name="IDR_SET_ICON_JS" file="extensions\set_icon.js" type="BINDAT A" /> 42 <include name="IDR_SET_ICON_JS" file="extensions\set_icon.js" type="BINDAT A" />
43 <include name="IDR_UTILS_JS" file="extensions\utils.js" type="BINDATA" /> 43 <include name="IDR_UTILS_JS" file="extensions\utils.js" type="BINDATA" />
44 <include name="IDR_ENTRY_ID_MANAGER" file="extensions\entry_id_manager.js" type="BINDATA" /> 44 <include name="IDR_ENTRY_ID_MANAGER" file="extensions\entry_id_manager.js" type="BINDATA" />
45 45
46 <if expr="pp_ifdef('enable_extensions')"> 46 <if expr="pp_ifdef('enable_extensions')">
47 <!-- Custom bindings for extension APIs. --> 47 <!-- Custom bindings for extension APIs. -->
48 <include name="IDR_AD_VIEW_DENY_JS" file="extensions\ad_view_deny.js" ty pe="BINDATA" />
49 <include name="IDR_AD_VIEW_JS" file="extensions\ad_view.js" type="BINDAT A" />
50 <include name="IDR_AD_VIEW_CUSTOM_JS" file="extensions\ad_view_custom.js " type="BINDATA" />
48 <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_b indings.js" type="BINDATA" /> 51 <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_b indings.js" type="BINDATA" />
49 <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_ runtime_custom_bindings.js" type="BINDATA" /> 52 <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_ runtime_custom_bindings.js" type="BINDATA" />
50 <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_w indow_custom_bindings.js" type="BINDATA" /> 53 <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_w indow_custom_bindings.js" type="BINDATA" />
51 <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\b rowser_action_custom_bindings.js" type="BINDATA" /> 54 <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\b rowser_action_custom_bindings.js" type="BINDATA" />
52 <include name="IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS" file="extensions \content_settings_custom_bindings.js" type="BINDATA" /> 55 <include name="IDR_CONTENT_SETTINGS_CUSTOM_BINDINGS_JS" file="extensions \content_settings_custom_bindings.js" type="BINDATA" />
53 <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="extensions\co ntext_menus_custom_bindings.js" type="BINDATA" /> 56 <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="extensions\co ntext_menus_custom_bindings.js" type="BINDATA" />
54 <include name="IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS" file="extensi ons\declarative_content_custom_bindings.js" type="BINDATA" /> 57 <include name="IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS" file="extensi ons\declarative_content_custom_bindings.js" type="BINDATA" />
55 <include name="IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS" file="exte nsions\declarative_webrequest_custom_bindings.js" type="BINDATA" /> 58 <include name="IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS" file="exte nsions\declarative_webrequest_custom_bindings.js" type="BINDATA" />
56 <include name="IDR_DOWNLOADS_CUSTOM_BINDINGS_JS" file="extensions\downlo ads_custom_bindings.js" type="BINDATA" /> 59 <include name="IDR_DOWNLOADS_CUSTOM_BINDINGS_JS" file="extensions\downlo ads_custom_bindings.js" type="BINDATA" />
57 <include name="IDR_BLUETOOTH_CUSTOM_BINDINGS_JS" file="extensions\blueto oth_custom_bindings.js" type="BINDATA" /> 60 <include name="IDR_BLUETOOTH_CUSTOM_BINDINGS_JS" file="extensions\blueto oth_custom_bindings.js" type="BINDATA" />
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" /> 92 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" />
90 93
91 <!-- Platform app support. --> 94 <!-- Platform app support. -->
92 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" /> 95 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" />
93 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" /> 96 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" />
94 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" /> 97 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" />
95 </if> 98 </if>
96 </includes> 99 </includes>
97 </release> 100 </release>
98 </grit> 101 </grit>
OLDNEW
« no previous file with comments | « chrome/renderer/resources/extensions/platform_app.css ('k') | chrome/test/data/extensions/platform_apps/ad_view/ad_network/ads/image315.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698