| Index: chrome/renderer/content_settings_observer.h
|
| diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
|
| index 6f5a6a9f07e602d8c97d04dd25236ffd24c6c817..cd13988dfd91d8bc581ed435c8ce3f4154a5fe95 100644
|
| --- a/chrome/renderer/content_settings_observer.h
|
| +++ b/chrome/renderer/content_settings_observer.h
|
| @@ -37,9 +37,9 @@ class ContentSettingsObserver
|
| extensions::Dispatcher* extension_dispatcher);
|
| virtual ~ContentSettingsObserver();
|
|
|
| - // Sets the content setting rules which back |AllowImage()|, |AllowScript()|,
|
| - // and |AllowScriptFromSource()|. |content_setting_rules| must outlive this
|
| - // |ContentSettingsObserver|.
|
| + // Sets the content setting rules which back |AllowImage()|, |AllowMedia()|,
|
| + // |AllowScript()|, and |AllowScriptFromSource()|. |content_setting_rules|
|
| + // must outlive this |ContentSettingsObserver|.
|
| void SetContentSettingRules(
|
| const RendererContentSettingRules* content_setting_rules);
|
|
|
| @@ -58,6 +58,7 @@ class ContentSettingsObserver
|
| const blink::WebURL& image_url) OVERRIDE;
|
| virtual bool allowIndexedDB(const blink::WebString& name,
|
| const blink::WebSecurityOrigin& origin) OVERRIDE;
|
| + virtual bool allowMedia(const blink::WebURL& image_url) OVERRIDE;
|
| virtual bool allowPlugins(bool enabled_per_settings) OVERRIDE;
|
| virtual bool allowScript(bool enabled_per_settings) OVERRIDE;
|
| virtual bool allowScriptFromSource(bool enabled_per_settings,
|
|
|