Chrome side changes to removing WebFrame parameter from WebPermissionClient, since it's redundant n…

chrome/renderer/content_settings_observer.h

Index: chrome/renderer/content_settings_observer.h
===================================================================
--- chrome/renderer/content_settings_observer.h	(revision 260883)
+++ chrome/renderer/content_settings_observer.h	(working copy)
@@ -49,6 +49,7 @@
   void DidBlockContentType(ContentSettingsType settings_type);
 
   // blink::WebPermissionClient implementation.
+  // TODO(jam): remove all these methods after Blink rolls.
   virtual bool allowDatabase(blink::WebFrame* frame,
                              const blink::WebString& name,
                              const blink::WebString& display_name,
@@ -89,6 +90,35 @@
       const blink::WebSecurityOrigin& context,
       const blink::WebURL& url);
 
+  virtual bool allowDatabase(const blink::WebString& name,
+                             const blink::WebString& display_name,
+                             unsigned long estimated_size);
+  virtual bool allowFileSystem();
+  virtual bool allowImage(bool enabled_per_settings,
+                          const blink::WebURL& image_url);
+  virtual bool allowIndexedDB(const blink::WebString& name,
+                              const blink::WebSecurityOrigin& origin);
+  virtual bool allowPlugins(bool enabled_per_settings);
+  virtual bool allowScript(bool enabled_per_settings);
+  virtual bool allowScriptFromSource(bool enabled_per_settings,
+                                     const blink::WebURL& script_url);
+  virtual bool allowStorage(bool local);
+  virtual bool allowReadFromClipboard(bool default_value);
+  virtual bool allowWriteToClipboard(bool default_value);
+  virtual bool allowWebComponents(bool);

[nasko, 2014/04/01 20:14:30]

nit: shouldn't the parameter be named for consistency with the rest?

[jam, 2014/04/01 21:35:09]

yep, done. I had just copied it :)

+  virtual bool allowMutationEvents(bool default_value);
+  virtual bool allowPushState();
+  virtual void didNotAllowPlugins();
+  virtual void didNotAllowScript();
+  virtual bool allowDisplayingInsecureContent(
+      bool allowed_per_settings,
+      const blink::WebSecurityOrigin& context,
+      const blink::WebURL& url);
+  virtual bool allowRunningInsecureContent(
+      bool allowed_per_settings,
+      const blink::WebSecurityOrigin& context,
+      const blink::WebURL& url);
+
   // This is used for cases when the NPAPI plugins malfunction if used.
   bool AreNPAPIPluginsBlocked() const;