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

chrome/renderer/content_settings_observer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 31 matching lines @@
   // |ContentSettingsObserver|.
   void SetContentSettingRules(
       const RendererContentSettingRules* content_setting_rules);
 
   bool IsPluginTemporarilyAllowed(const std::string& identifier);
 
   // Sends an IPC notification that the specified content type was blocked.
   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,
                              unsigned long estimated_size);
   virtual bool allowFileSystem(blink::WebFrame* frame);
   virtual bool allowImage(blink::WebFrame* frame,
                           bool enabled_per_settings,
                           const blink::WebURL& image_url);
   virtual bool allowIndexedDB(blink::WebFrame* frame,
                               const blink::WebString& name,
@@ skipping 20 matching lines @@
       blink::WebFrame* frame,
       bool allowed_per_settings,
       const blink::WebSecurityOrigin& context,
       const blink::WebURL& url);
   virtual bool allowRunningInsecureContent(
       blink::WebFrame* frame,
       bool allowed_per_settings,
       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;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ContentSettingsObserverTest, WhitelistedSchemes);
   FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest,
                            ContentSettingsInterstitialPages);
   FRIEND_TEST_ALL_PREFIXES(ChromeRenderViewTest, PluginsTemporarilyAllowed);
 
   // RenderFrameObserver implementation.
@@ skipping 47 matching lines @@
   std::map<blink::WebFrame*, bool> cached_script_permissions_;
 
   std::set<std::string> temporarily_allowed_plugins_;
   bool is_interstitial_page_;
   bool npapi_plugins_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_