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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12313115: Take notification API out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict. 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
« no previous file with comments | « chrome/renderer/resources/extensions/notifications_custom_bindings.js ('k') | chrome/test/data/extensions/api_test/notification/api/by_user/background.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 <!-- 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 <include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="extensions\perm issions_custom_bindings.js" type="BINDATA" /> 58 <include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="extensions\perm issions_custom_bindings.js" type="BINDATA" />
59 <include name="IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file ="extensions\experimental.media_galleries_custom_bindings.js" type="BINDATA" /> 59 <include name="IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file ="extensions\experimental.media_galleries_custom_bindings.js" type="BINDATA" />
60 <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file=" extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" /> 60 <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file=" extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" />
61 <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="extensions\extens ion_custom_bindings.js" type="BINDATA" /> 61 <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="extensions\extens ion_custom_bindings.js" type="BINDATA" />
62 <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="extens ions\file_browser_handler_custom_bindings.js" type="BINDATA" /> 62 <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="extens ions\file_browser_handler_custom_bindings.js" type="BINDATA" />
63 <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="extens ions\file_browser_private_custom_bindings.js" type="BINDATA" /> 63 <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="extens ions\file_browser_private_custom_bindings.js" type="BINDATA" />
64 <include name="IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions\file _system_custom_bindings.js" type="BINDATA" /> 64 <include name="IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions\file _system_custom_bindings.js" type="BINDATA" />
65 <include name="IDR_I18N_CUSTOM_BINDINGS_JS" file="extensions\i18n_custom _bindings.js" type="BINDATA" /> 65 <include name="IDR_I18N_CUSTOM_BINDINGS_JS" file="extensions\i18n_custom _bindings.js" type="BINDATA" />
66 <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="extensions\input. ime_custom_bindings.js" type="BINDATA" /> 66 <include name="IDR_INPUT_IME_CUSTOM_BINDINGS_JS" file="extensions\input. ime_custom_bindings.js" type="BINDATA" />
67 <include name="IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file="extensions\ media_galleries_custom_bindings.js" type="BINDATA" /> 67 <include name="IDR_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file="extensions\ media_galleries_custom_bindings.js" type="BINDATA" />
68 <include name="IDR_NOTIFICATION_CUSTOM_BINDINGS_JS" file="extensions\not ification_custom_bindings.js" type="BINDATA" /> 68 <include name="IDR_NOTIFICATIONS_CUSTOM_BINDINGS_JS" file="extensions\no tifications_custom_bindings.js" type="BINDATA" />
69 <include name="IDR_OMNIBOX_CUSTOM_BINDINGS_JS" file="extensions\omnibox_ custom_bindings.js" type="BINDATA" /> 69 <include name="IDR_OMNIBOX_CUSTOM_BINDINGS_JS" file="extensions\omnibox_ custom_bindings.js" type="BINDATA" />
70 <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="extensions\pag e_actions_custom_bindings.js" type="BINDATA" /> 70 <include name="IDR_PAGE_ACTIONS_CUSTOM_BINDINGS_JS" file="extensions\pag e_actions_custom_bindings.js" type="BINDATA" />
71 <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="extensions\page _action_custom_bindings.js" type="BINDATA" /> 71 <include name="IDR_PAGE_ACTION_CUSTOM_BINDINGS_JS" file="extensions\page _action_custom_bindings.js" type="BINDATA" />
72 <include name="IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\pag e_capture_custom_bindings.js" type="BINDATA" /> 72 <include name="IDR_PAGE_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\pag e_capture_custom_bindings.js" type="BINDATA" />
73 <include name="IDR_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\runtime_ custom_bindings.js" type="BINDATA" /> 73 <include name="IDR_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\runtime_ custom_bindings.js" type="BINDATA" />
74 <include name="IDR_BINDING_JS" file="extensions\binding.js" type="BINDAT A" /> 74 <include name="IDR_BINDING_JS" file="extensions\binding.js" type="BINDAT A" />
75 <include name="IDR_STORAGE_CUSTOM_BINDINGS_JS" file="extensions\storage_ custom_bindings.js" type="BINDATA" /> 75 <include name="IDR_STORAGE_CUSTOM_BINDINGS_JS" file="extensions\storage_ custom_bindings.js" type="BINDATA" />
76 <include name="IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions \sync_file_system_custom_bindings.js" type="BINDATA" /> 76 <include name="IDR_SYNC_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions \sync_file_system_custom_bindings.js" type="BINDATA" />
77 <include name="IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS" file="extensions \system_indicator_custom_bindings.js" type="BINDATA" /> 77 <include name="IDR_SYSTEM_INDICATOR_CUSTOM_BINDINGS_JS" file="extensions \system_indicator_custom_bindings.js" type="BINDATA" />
78 <include name="IDR_TAB_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\tab_ capture_custom_bindings.js" type="BINDATA" /> 78 <include name="IDR_TAB_CAPTURE_CUSTOM_BINDINGS_JS" file="extensions\tab_ capture_custom_bindings.js" type="BINDATA" />
(...skipping 10 matching lines...) Expand all
89 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" /> 89 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" />
90 90
91 <!-- Platform app support. --> 91 <!-- Platform app support. -->
92 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" /> 92 <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" /> 93 <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" /> 94 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" />
95 </if> 95 </if>
96 </includes> 96 </includes>
97 </release> 97 </release>
98 </grit> 98 </grit>
OLDNEW
« no previous file with comments | « chrome/renderer/resources/extensions/notifications_custom_bindings.js ('k') | chrome/test/data/extensions/api_test/notification/api/by_user/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698