| Index: chrome/renderer/content_settings_observer.h
|
| diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
|
| index c9dc4bd691cf0f1c47a9b416cec1d37f5353cba1..f69a1d5b78b61d217627269ce356d40f1a3543ff 100644
|
| --- a/chrome/renderer/content_settings_observer.h
|
| +++ b/chrome/renderer/content_settings_observer.h
|
| @@ -12,6 +12,7 @@
|
| #include "content/public/renderer/render_frame_observer.h"
|
| #include "content/public/renderer/render_frame_observer_tracker.h"
|
| #include "extensions/common/permissions/api_permission.h"
|
| +#include "third_party/WebKit/public/web/WebLocalFrame.h"
|
| #include "third_party/WebKit/public/web/WebPermissionClient.h"
|
|
|
| class GURL;
|
| @@ -50,42 +51,42 @@ class ContentSettingsObserver
|
|
|
| // blink::WebPermissionClient implementation.
|
| // TODO(jam): remove all these methods after Blink rolls.
|
| - virtual bool allowDatabase(blink::WebFrame* frame,
|
| + virtual bool allowDatabase(blink::WebLocalFrame* frame,
|
| const blink::WebString& name,
|
| const blink::WebString& display_name,
|
| unsigned long estimated_size);
|
| - virtual bool allowFileSystem(blink::WebFrame* frame);
|
| - virtual bool allowImage(blink::WebFrame* frame,
|
| + virtual bool allowFileSystem(blink::WebLocalFrame* frame);
|
| + virtual bool allowImage(blink::WebLocalFrame* frame,
|
| bool enabled_per_settings,
|
| const blink::WebURL& image_url);
|
| - virtual bool allowIndexedDB(blink::WebFrame* frame,
|
| + virtual bool allowIndexedDB(blink::WebLocalFrame* frame,
|
| const blink::WebString& name,
|
| const blink::WebSecurityOrigin& origin);
|
| - virtual bool allowPlugins(blink::WebFrame* frame,
|
| + virtual bool allowPlugins(blink::WebLocalFrame* frame,
|
| bool enabled_per_settings);
|
| - virtual bool allowScript(blink::WebFrame* frame,
|
| + virtual bool allowScript(blink::WebLocalFrame* frame,
|
| bool enabled_per_settings);
|
| - virtual bool allowScriptFromSource(blink::WebFrame* frame,
|
| + virtual bool allowScriptFromSource(blink::WebLocalFrame* frame,
|
| bool enabled_per_settings,
|
| const blink::WebURL& script_url);
|
| - virtual bool allowStorage(blink::WebFrame* frame, bool local);
|
| - virtual bool allowReadFromClipboard(blink::WebFrame* frame,
|
| + virtual bool allowStorage(blink::WebLocalFrame* frame, bool local);
|
| + virtual bool allowReadFromClipboard(blink::WebLocalFrame* frame,
|
| bool default_value);
|
| - virtual bool allowWriteToClipboard(blink::WebFrame* frame,
|
| + virtual bool allowWriteToClipboard(blink::WebLocalFrame* frame,
|
| bool default_value);
|
| - virtual bool allowWebComponents(blink::WebFrame* frame, bool);
|
| - virtual bool allowMutationEvents(blink::WebFrame* frame,
|
| + virtual bool allowWebComponents(blink::WebLocalFrame* frame, bool);
|
| + virtual bool allowMutationEvents(blink::WebLocalFrame* frame,
|
| bool default_value);
|
| - virtual bool allowPushState(blink::WebFrame* frame);
|
| - virtual void didNotAllowPlugins(blink::WebFrame* frame);
|
| - virtual void didNotAllowScript(blink::WebFrame* frame);
|
| + virtual bool allowPushState(blink::WebLocalFrame* frame);
|
| + virtual void didNotAllowPlugins(blink::WebLocalFrame* frame);
|
| + virtual void didNotAllowScript(blink::WebLocalFrame* frame);
|
| virtual bool allowDisplayingInsecureContent(
|
| - blink::WebFrame* frame,
|
| + blink::WebLocalFrame* frame,
|
| bool allowed_per_settings,
|
| const blink::WebSecurityOrigin& context,
|
| const blink::WebURL& url);
|
| virtual bool allowRunningInsecureContent(
|
| - blink::WebFrame* frame,
|
| + blink::WebLocalFrame* frame,
|
| bool allowed_per_settings,
|
| const blink::WebSecurityOrigin& context,
|
| const blink::WebURL& url);
|
|
|