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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 18341016: Add types.private.ChromeDirectSetting and Connect it to preferencesPrivate.googleGeolocationAccessE… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync to Latest Created 7 years, 5 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/chrome_direct_setting.js ('k') | tools/metrics/histograms/histograms.xml » ('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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 <include name="IDR_UTILS_JS" file="extensions\utils.js" type="BINDATA" /> 44 <include name="IDR_UTILS_JS" file="extensions\utils.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" /> 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" /> 49 <include name="IDR_AD_VIEW_JS" file="extensions\ad_view.js" type="BINDAT A" />
50 <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_b indings.js" type="BINDATA" /> 50 <include name="IDR_APP_CUSTOM_BINDINGS_JS" file="extensions\app_custom_b indings.js" type="BINDATA" />
51 <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_ runtime_custom_bindings.js" type="BINDATA" /> 51 <include name="IDR_APP_RUNTIME_CUSTOM_BINDINGS_JS" file="extensions\app_ runtime_custom_bindings.js" type="BINDATA" />
52 <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_w indow_custom_bindings.js" type="BINDATA" /> 52 <include name="IDR_APP_WINDOW_CUSTOM_BINDINGS_JS" file="extensions\app_w indow_custom_bindings.js" type="BINDATA" />
53 <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\b rowser_action_custom_bindings.js" type="BINDATA" /> 53 <include name="IDR_BROWSER_ACTION_CUSTOM_BINDINGS_JS" file="extensions\b rowser_action_custom_bindings.js" type="BINDATA" />
54 <include name="IDR_CHROME_DIRECT_SETTING_JS"
55 file="extensions\chrome_direct_setting.js" type="BINDATA" />
54 <include name="IDR_CHROME_SETTING_JS" file="extensions\chrome_setting.js " type="BINDATA" /> 56 <include name="IDR_CHROME_SETTING_JS" file="extensions\chrome_setting.js " type="BINDATA" />
55 <include name="IDR_CONTENT_SETTING_JS" file="extensions\content_setting. js" type="BINDATA" /> 57 <include name="IDR_CONTENT_SETTING_JS" file="extensions\content_setting. js" type="BINDATA" />
56 <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="extensions\co ntext_menus_custom_bindings.js" type="BINDATA" /> 58 <include name="IDR_CONTEXT_MENUS_CUSTOM_BINDINGS_JS" file="extensions\co ntext_menus_custom_bindings.js" type="BINDATA" />
57 <include name="IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS" file="extensi ons\declarative_content_custom_bindings.js" type="BINDATA" /> 59 <include name="IDR_DECLARATIVE_CONTENT_CUSTOM_BINDINGS_JS" file="extensi ons\declarative_content_custom_bindings.js" type="BINDATA" />
58 <include name="IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS" file="exte nsions\declarative_webrequest_custom_bindings.js" type="BINDATA" /> 60 <include name="IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS" file="exte nsions\declarative_webrequest_custom_bindings.js" type="BINDATA" />
59 <include name="IDR_DOWNLOADS_CUSTOM_BINDINGS_JS" file="extensions\downlo ads_custom_bindings.js" type="BINDATA" /> 61 <include name="IDR_DOWNLOADS_CUSTOM_BINDINGS_JS" file="extensions\downlo ads_custom_bindings.js" type="BINDATA" />
60 <include name="IDR_BLUETOOTH_CUSTOM_BINDINGS_JS" file="extensions\blueto oth_custom_bindings.js" type="BINDATA" /> 62 <include name="IDR_BLUETOOTH_CUSTOM_BINDINGS_JS" file="extensions\blueto oth_custom_bindings.js" type="BINDATA" />
61 <include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="extensions\perm issions_custom_bindings.js" type="BINDATA" /> 63 <include name="IDR_PERMISSIONS_CUSTOM_BINDINGS_JS" file="extensions\perm issions_custom_bindings.js" type="BINDATA" />
62 <include name="IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file ="extensions\experimental.media_galleries_custom_bindings.js" type="BINDATA" /> 64 <include name="IDR_EXPERIMENTAL_MEDIA_GALLERIES_CUSTOM_BINDINGS_JS" file ="extensions\experimental.media_galleries_custom_bindings.js" type="BINDATA" />
63 <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file=" extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" /> 65 <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file=" extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" />
(...skipping 30 matching lines...) Expand all
94 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" /> 96 <include name="IDR_WEB_VIEW_JS" file="extensions\web_view.js" type="BIND ATA" />
95 97
96 <!-- Platform app support. --> 98 <!-- Platform app support. -->
97 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" /> 99 <include name="IDR_PLATFORM_APP_CSS" file="extensions\platform_app.css" type="BINDATA" />
98 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" /> 100 <include name="IDR_PLATFORM_APP_JS" file="extensions\platform_app.js" ty pe="BINDATA" />
99 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" /> 101 <include name="IDR_INJECT_APP_TITLEBAR_JS" file="extensions\inject_app_t itlebar.js" type="BINDATA" />
100 </if> 102 </if>
101 </includes> 103 </includes>
102 </release> 104 </release>
103 </grit> 105 </grit>
OLDNEW
« no previous file with comments | « chrome/renderer/resources/extensions/chrome_direct_setting.js ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698