[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / ewk / efl_integration / browser / permission_manager_efl.cc

diff --git a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc
index c9b1293..8130ae1 100644 (file)
--- a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc
+++ b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc
@@ -12,8 +12,8 @@
 #include "content_main_delegate_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/permission_type.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ewk_global_data.h"
 
@@ -26,13 +26,16 @@ PermissionManagerEfl::~PermissionManagerEfl() {
 }
 
 void PermissionManagerEfl::RequestPermission(PermissionType permission,
-                       WebContents* web_contents,
+                       content::RenderFrameHost* render_frame_host,
                        int request_id,
                        const GURL& requesting_origin,
                        bool user_gesture,
                        const base::Callback<void(PermissionStatus)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  content::WebContents* web_contents =
+      content::WebContents::FromRenderFrameHost(render_frame_host);
+
   switch (permission) {
     case PermissionType::GEOLOCATION: {
       BrowserContextEfl* browser_context =
@@ -45,11 +48,12 @@ void PermissionManagerEfl::RequestPermission(PermissionType permission,
 
       const GeolocationPermissionContextEfl& geolocation_permission_context =
           browser_context->GetGeolocationPermissionContext();
-      int render_process_id = web_contents->GetRenderProcessHost()->GetID();
-      int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+
+      int render_process_id = render_frame_host->GetProcess()->GetID();
+      int render_frame_id = render_frame_host->GetRoutingID();
 
       geolocation_permission_context.RequestPermission(render_process_id,
-                                                       render_view_id,
+                                                       render_frame_id,
                                                        requesting_origin,
                                                        callback);
       break;
@@ -70,6 +74,7 @@ void PermissionManagerEfl::RequestPermission(PermissionType permission,
       cbce->GetNotificationController()->RequestPermission(web_contents,
                                                            requesting_origin,
                                                            callback);
+
 #else
       callback.Run(PermissionStatus::PERMISSION_STATUS_DENIED);
 #endif
@@ -90,10 +95,11 @@ void PermissionManagerEfl::RequestPermission(PermissionType permission,
   }
 }
 
-void PermissionManagerEfl::CancelPermissionRequest(PermissionType permission,
-                                               WebContents* web_contents,
-                                               int request_id,
-                                               const GURL& requesting_origin) {
+void PermissionManagerEfl::CancelPermissionRequest(
+    PermissionType permission,
+    content::RenderFrameHost* render_frame_host,
+    int request_id,
+    const GURL& requesting_origin) {
 }
 
 PermissionStatus PermissionManagerEfl::GetPermissionStatus(