Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / renderer / android / xwalk_permission_client.cc

diff --git a/src/xwalk/runtime/renderer/android/xwalk_permission_client.cc b/src/xwalk/runtime/renderer/android/xwalk_permission_client.cc
index 2a9bd64..20cf279 100644 (file)
--- a/src/xwalk/runtime/renderer/android/xwalk_permission_client.cc
+++ b/src/xwalk/runtime/renderer/android/xwalk_permission_client.cc
@@ -7,12 +7,11 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 namespace xwalk {
 
-
 XWalkPermissionClient::XWalkPermissionClient(content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame) {
   render_frame->GetWebFrame()->setPermissionClient(this);
@@ -21,9 +20,8 @@ XWalkPermissionClient::XWalkPermissionClient(content::RenderFrame* render_frame)
 XWalkPermissionClient::~XWalkPermissionClient() {
 }
 
-bool XWalkPermissionClient::allowImage(blink::WebFrame* frame,
-                                 bool enabled_per_settings,
-                                 const blink::WebURL& image_url) {
+bool XWalkPermissionClient::allowImage(bool enabled_per_settings,
+                                       const blink::WebURL& image_url) {
   // Implementing setBlockNetworkImages, so allow local scheme images to be
   // loaded.
   if (enabled_per_settings)
@@ -33,7 +31,7 @@ bool XWalkPermissionClient::allowImage(blink::WebFrame* frame,
   const GURL url(image_url);
   return !(url.SchemeIs(url::kHttpScheme) ||
            url.SchemeIs(url::kHttpsScheme) ||
-           url.SchemeIs(content::kFtpScheme));
+           url.SchemeIs(url::kFtpScheme));
 }
 
 }  // namespace xwalk