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

Side by Side Diff: public/blink_resources.grd

Issue 516273002: Move plugin placeholder style to CSS, and allow it to bypass main world CSP. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: whitelist an explicit string Created 6 years, 3 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 | « Source/core/html/shadow/PluginPlaceholderElement.js ('k') | no next file » | 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/blink_resources.h" type="rc_header"> 4 <output filename="grit/blink_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="blink_resources.rc" type="rc_all" /> 7 <output filename="blink_resources.rc" type="rc_all" />
8 <output filename="blink_resources.pak" type="data_package" /> 8 <output filename="blink_resources.pak" type="data_package" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 <include name="IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS" file="../Source/bi ndings/core/v8/DebuggerScript.js" type="BINDATA"/> 43 <include name="IDR_INSPECTOR_DEBUGGER_SCRIPT_SOURCE_JS" file="../Source/bi ndings/core/v8/DebuggerScript.js" type="BINDATA"/>
44 <include name="IDR_PICKER_COMMON_JS" file="../Source/web/resources/pickerC ommon.js" type="BINDATA"/> 44 <include name="IDR_PICKER_COMMON_JS" file="../Source/web/resources/pickerC ommon.js" type="BINDATA"/>
45 <include name="IDR_PICKER_COMMON_CSS" file="../Source/web/resources/picker Common.css" type="BINDATA"/> 45 <include name="IDR_PICKER_COMMON_CSS" file="../Source/web/resources/picker Common.css" type="BINDATA"/>
46 <include name="IDR_CALENDAR_PICKER_CSS" file="../Source/web/resources/cale ndarPicker.css" type="BINDATA"/> 46 <include name="IDR_CALENDAR_PICKER_CSS" file="../Source/web/resources/cale ndarPicker.css" type="BINDATA"/>
47 <include name="IDR_CALENDAR_PICKER_JS" file="../Source/web/resources/calen darPicker.js" type="BINDATA"/> 47 <include name="IDR_CALENDAR_PICKER_JS" file="../Source/web/resources/calen darPicker.js" type="BINDATA"/>
48 <include name="IDR_PICKER_BUTTON_CSS" file="../Source/web/resources/picker Button.css" type="BINDATA"/> 48 <include name="IDR_PICKER_BUTTON_CSS" file="../Source/web/resources/picker Button.css" type="BINDATA"/>
49 <include name="IDR_SUGGESTION_PICKER_CSS" file="../Source/web/resources/su ggestionPicker.css" type="BINDATA"/> 49 <include name="IDR_SUGGESTION_PICKER_CSS" file="../Source/web/resources/su ggestionPicker.css" type="BINDATA"/>
50 <include name="IDR_SUGGESTION_PICKER_JS" file="../Source/web/resources/sug gestionPicker.js" type="BINDATA"/> 50 <include name="IDR_SUGGESTION_PICKER_JS" file="../Source/web/resources/sug gestionPicker.js" type="BINDATA"/>
51 <include name="IDR_COLOR_SUGGESTION_PICKER_CSS" file="../Source/web/resour ces/colorSuggestionPicker.css" type="BINDATA"/> 51 <include name="IDR_COLOR_SUGGESTION_PICKER_CSS" file="../Source/web/resour ces/colorSuggestionPicker.css" type="BINDATA"/>
52 <include name="IDR_COLOR_SUGGESTION_PICKER_JS" file="../Source/web/resourc es/colorSuggestionPicker.js" type="BINDATA"/> 52 <include name="IDR_COLOR_SUGGESTION_PICKER_JS" file="../Source/web/resourc es/colorSuggestionPicker.js" type="BINDATA"/>
53 <include name="IDR_PLUGIN_PLACEHOLDER_ELEMENT_CSS" file="../Source/core/ht ml/shadow/PluginPlaceholderElement.css" type="BINDATA"/>
jbroman 2014/09/02 15:44:04 According to http://crbug.com/312586, this is the
53 <if expr="pp_ifdef('use_concatenated_impulse_responses')"> 54 <if expr="pp_ifdef('use_concatenated_impulse_responses')">
54 <include name="IDR_AUDIO_SPATIALIZATION_COMPOSITE" file="../Source/platf orm/audio/resources/Composite.wav" type="BINDATA"/> 55 <include name="IDR_AUDIO_SPATIALIZATION_COMPOSITE" file="../Source/platf orm/audio/resources/Composite.wav" type="BINDATA"/>
55 </if> 56 </if>
56 <if expr="not pp_ifdef('use_concatenated_impulse_responses')"> 57 <if expr="not pp_ifdef('use_concatenated_impulse_responses')">
57 <include name="IDR_AUDIO_SPATIALIZATION_T000_P000" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P000.wav" type="BINDATA"/> 58 <include name="IDR_AUDIO_SPATIALIZATION_T000_P000" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P000.wav" type="BINDATA"/>
58 <include name="IDR_AUDIO_SPATIALIZATION_T000_P015" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P015.wav" type="BINDATA"/> 59 <include name="IDR_AUDIO_SPATIALIZATION_T000_P015" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P015.wav" type="BINDATA"/>
59 <include name="IDR_AUDIO_SPATIALIZATION_T000_P030" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P030.wav" type="BINDATA"/> 60 <include name="IDR_AUDIO_SPATIALIZATION_T000_P030" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P030.wav" type="BINDATA"/>
60 <include name="IDR_AUDIO_SPATIALIZATION_T000_P045" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P045.wav" type="BINDATA"/> 61 <include name="IDR_AUDIO_SPATIALIZATION_T000_P045" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P045.wav" type="BINDATA"/>
61 <include name="IDR_AUDIO_SPATIALIZATION_T000_P060" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P060.wav" type="BINDATA"/> 62 <include name="IDR_AUDIO_SPATIALIZATION_T000_P060" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P060.wav" type="BINDATA"/>
62 <include name="IDR_AUDIO_SPATIALIZATION_T000_P075" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P075.wav" type="BINDATA"/> 63 <include name="IDR_AUDIO_SPATIALIZATION_T000_P075" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T000_P075.wav" type="BINDATA"/>
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 <include name="IDR_AUDIO_SPATIALIZATION_T345_P060" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P060.wav" type="BINDATA"/> 292 <include name="IDR_AUDIO_SPATIALIZATION_T345_P060" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P060.wav" type="BINDATA"/>
292 <include name="IDR_AUDIO_SPATIALIZATION_T345_P075" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P075.wav" type="BINDATA"/> 293 <include name="IDR_AUDIO_SPATIALIZATION_T345_P075" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P075.wav" type="BINDATA"/>
293 <include name="IDR_AUDIO_SPATIALIZATION_T345_P090" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P090.wav" type="BINDATA"/> 294 <include name="IDR_AUDIO_SPATIALIZATION_T345_P090" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P090.wav" type="BINDATA"/>
294 <include name="IDR_AUDIO_SPATIALIZATION_T345_P315" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P315.wav" type="BINDATA"/> 295 <include name="IDR_AUDIO_SPATIALIZATION_T345_P315" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P315.wav" type="BINDATA"/>
295 <include name="IDR_AUDIO_SPATIALIZATION_T345_P330" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P330.wav" type="BINDATA"/> 296 <include name="IDR_AUDIO_SPATIALIZATION_T345_P330" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P330.wav" type="BINDATA"/>
296 <include name="IDR_AUDIO_SPATIALIZATION_T345_P345" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P345.wav" type="BINDATA"/> 297 <include name="IDR_AUDIO_SPATIALIZATION_T345_P345" file="..\Source\platf orm\audio\resources\IRC_Composite_C_R0195_T345_P345.wav" type="BINDATA"/>
297 </if> 298 </if>
298 </includes> 299 </includes>
299 </release> 300 </release>
300 </grit> 301 </grit>
OLDNEW
« no previous file with comments | « Source/core/html/shadow/PluginPlaceholderElement.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698