Core - Fix IRequestContextHandler.GetResourceRequestHandler never called

CefRequestContextHandlerAdapter now implements GetResourceRequestHandler

Author: amaitland

CefSharp.Core/Internals/CefRequestContextHandlerAdapter.cpp

@@ -6,9 +6,13 @@
 
 #include "CefRequestContextHandlerAdapter.h"
 #include "CookieManager.h"
+#include "Request.h"
 #include "RequestContext.h"
 #include "Internals\ReportUnhandledExceptions.h"
 #include "Internals\TypeConversion.h"
+#include "Internals\CefBrowserWrapper.h"
+#include "Internals\CefFrameWrapper.h"
+#include "Internals\CefResourceRequestHandlerAdapter.h"
 
 namespace CefSharp
 {
@@ -50,5 +54,36 @@ namespace CefSharp
                 _requestContextHandler->OnRequestContextInitialized(%ctx);
             }
         }
+
+        CefRefPtr<CefResourceRequestHandler> CefRequestContextHandlerAdapter::GetResourceRequestHandler(
+            CefRefPtr<CefBrowser> browser,
+            CefRefPtr<CefFrame> frame,
+            CefRefPtr<CefRequest> request,
+            bool is_navigation,
+            bool is_download,
+            const CefString& request_initiator,
+            bool& disable_default_handling)
+        {
+            if (Object::ReferenceEquals(_requestContextHandler, nullptr))
+            {
+
+                return NULL;
+            }
+
+            CefBrowserWrapper browserWrapper(browser);
+            CefFrameWrapper frameWrapper(frame);
+            Request requestWrapper(request);
+
+            auto handler = _requestContextHandler->GetResourceRequestHandler(%browserWrapper, %frameWrapper, %requestWrapper, is_navigation, is_download, StringUtils::ToClr(request_initiator), disable_default_handling);
+
+            if (Object::ReferenceEquals(handler, nullptr))
+            {
+                return NULL;
+            }
+
+            //CefRequestContext is not associated with a specific browser
+            //so browserControl param is always nullptr.
+            return new CefResourceRequestHandlerAdapter(nullptr, handler);
+        }
     }
 }

CefSharp.Core/Internals/CefRequestContextHandlerAdapter.h

@@ -40,6 +40,15 @@ namespace CefSharp
 
             virtual void OnRequestContextInitialized(CefRefPtr<CefRequestContext> requestContext) OVERRIDE;
 
+            virtual CefRefPtr<CefResourceRequestHandler> GetResourceRequestHandler(
+                CefRefPtr<CefBrowser> browser,
+                CefRefPtr<CefFrame> frame,
+                CefRefPtr<CefRequest> request,
+                bool is_navigation,
+                bool is_download,
+                const CefString& request_initiator,
+                bool& disable_default_handling) OVERRIDE;
+
             IMPLEMENT_REFCOUNTING(CefRequestContextHandlerAdapter);
         };
     }