From 19739abd9cc69529ecd06e86400e6f1068f14e6c Mon Sep 17 00:00:00 2001
From: amaitland <307872+amaitland@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:53:17 +1000
Subject: [PATCH] Remove Alloy Bootstrap (M128)

- Remove ChromeRuntime option
- Remove Extension Handling and related methods (no longer supported)
- Remove PackLoadingDisabled (no longer supported)
- Remove PersistUserPreferences (always on)

Resolves #4795
---
 CefSharp.Core.Runtime/Cef.h                   |   3 +-
 CefSharp.Core.Runtime/CefSettingsBase.h       |  34 ---
 .../CefSharp.Core.Runtime.vcxproj             |   3 -
 .../CefSharp.Core.Runtime.vcxproj.filters     |   9 -
 .../Internals/CefBrowserHostWrapper.cpp       |  22 --
 .../Internals/CefBrowserHostWrapper.h         |  10 -
 .../Internals/CefExtensionHandlerAdapter.h    | 214 --------------
 .../Internals/CefExtensionWrapper.cpp         |  87 ------
 .../Internals/CefExtensionWrapper.h           |  55 ----
 .../CefNavigationEntryVisitorAdapter.h        |   1 +
 CefSharp.Core.Runtime/RequestContext.cpp      |  79 ------
 CefSharp.Core.Runtime/RequestContext.h        |  82 ------
 .../RequestContextSettings.h                  |  12 -
 CefSharp.Core/CefSettingsBase.cs              |  34 ---
 CefSharp.Core/RequestContext.cs               |  40 ---
 CefSharp.Core/RequestContextBuilder.cs        |  22 +-
 CefSharp.Core/RequestContextSettings.cs       |  12 -
 CefSharp.Example/Handlers/ExtensionHandler.cs |  70 -----
 CefSharp.OffScreen/CefSettings.cs             |   1 -
 .../BrowserForm.Designer.cs                   | 116 ++++----
 CefSharp.WinForms.Example/BrowserForm.cs      |  59 ----
 CefSharp.WinForms/CefSettings.cs              |   2 -
 CefSharp.Wpf.Example/MainWindow.xaml          |   1 -
 CefSharp.Wpf.Example/MainWindow.xaml.cs       |  48 ----
 CefSharp.Wpf/CefSettings.cs                   |   1 -
 .../Callback/IGetExtensionResourceCallback.cs |  32 ---
 CefSharp/DependencyChecker.cs                 |   6 +-
 CefSharp/Enums/CefRuntimeStyle.cs             |  12 +-
 CefSharp/Handler/ExtensionHandler .cs         | 261 ------------------
 CefSharp/Handler/IExtensionHandler.cs         | 103 -------
 CefSharp/IBrowserHost.cs                      |  12 -
 CefSharp/IExtension.cs                        |  64 -----
 CefSharp/IRequestContext.cs                   |  79 ------
 CefSharp/RequestContextExtensions.cs          |  35 ---
 34 files changed, 63 insertions(+), 1558 deletions(-)
 delete mode 100644 CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h
 delete mode 100644 CefSharp.Core.Runtime/Internals/CefExtensionWrapper.cpp
 delete mode 100644 CefSharp.Core.Runtime/Internals/CefExtensionWrapper.h
 delete mode 100644 CefSharp.Example/Handlers/ExtensionHandler.cs
 delete mode 100644 CefSharp/Callback/IGetExtensionResourceCallback.cs
 delete mode 100644 CefSharp/Handler/ExtensionHandler .cs
 delete mode 100644 CefSharp/Handler/IExtensionHandler.cs
 delete mode 100644 CefSharp/IExtension.cs

diff --git a/CefSharp.Core.Runtime/Cef.h b/CefSharp.Core.Runtime/Cef.h
index 0301d2acf0..13f4f4123e 100644
--- a/CefSharp.Core.Runtime/Cef.h
+++ b/CefSharp.Core.Runtime/Cef.h
@@ -286,10 +286,9 @@ namespace CefSharp
                 PathCheck::AssertAbsolute(cefSettings->LocalesDirPath, "CefSettings.LocalesDirPath");
                 PathCheck::AssertAbsolute(cefSettings->BrowserSubprocessPath, "CefSettings.BrowserSubprocessPath");
 
-
                 if (performDependencyCheck)
                 {
-                    DependencyChecker::AssertAllDependenciesPresent(cefSettings->Locale, cefSettings->LocalesDirPath, cefSettings->ResourcesDirPath, cefSettings->PackLoadingDisabled, cefSettings->BrowserSubprocessPath);
+                    DependencyChecker::AssertAllDependenciesPresent(cefSettings->Locale, cefSettings->LocalesDirPath, cefSettings->ResourcesDirPath, false, cefSettings->BrowserSubprocessPath);
                 }
                 else if (!File::Exists(cefSettings->BrowserSubprocessPath))
                 {
diff --git a/CefSharp.Core.Runtime/CefSettingsBase.h b/CefSharp.Core.Runtime/CefSettingsBase.h
index 55db47922f..98128b2000 100644
--- a/CefSharp.Core.Runtime/CefSettingsBase.h
+++ b/CefSharp.Core.Runtime/CefSettingsBase.h
@@ -84,18 +84,6 @@ namespace CefSharp
                 CommandLineArgDictionary^ get() { return _cefCommandLineArgs; }
             }
 
-            /// <summary>
-            /// **Experimental**
-            /// Set to true to enable use of the Chrome runtime in CEF. This feature is
-            /// considered experimental and is not recommended for most users at this time.
-            /// See issue https://github.com/chromiumembedded/cef/issues/2969
-            /// </summary>
-            property bool ChromeRuntime
-            {
-                bool get() { return _cefSettings->chrome_runtime == 1; }
-                void set(bool value) { _cefSettings->chrome_runtime = value; }
-            }
-
             /// <summary>
             /// Set to true to disable configuration of browser process features using standard CEF and Chromium command-line arguments.
             /// Configuration can still be specified using CEF data structures or by adding to CefCommandLineArgs.
@@ -235,17 +223,6 @@ namespace CefSharp
                 void set(String^ value) { StringUtils::AssignNativeFromClr(_cefSettings->javascript_flags, value); }
             }
 
-            /// <summary>
-            /// Set to true to disable loading of pack files for resources and locales. A resource bundle handler must be provided for the
-            /// browser and render processes via CefApp::GetResourceBundleHandler() if loading of pack files is disabled. Also configurable
-            /// using the "disable-pack-loading" command- line switch.
-            /// </summary>
-            property bool PackLoadingDisabled
-            {
-                bool get() { return _cefSettings->pack_loading_disabled == 1; }
-                void set(bool value) { _cefSettings->pack_loading_disabled = value; }
-            }
-
             /// <summary>
             /// Value that will be inserted as the product portion of the default User-Agent string. If empty the Chromium product version
             /// will be used. If UserAgent is specified this value will be ignored. Also configurable using the "user-agent-product" command-
@@ -312,17 +289,6 @@ namespace CefSharp
                 void set(bool value) { _cefSettings->persist_session_cookies = value; }
             }
 
-            /// <summary>
-            /// To persist user preferences as a JSON file in the cache path directory set this value to true. A CachePath value must also be
-            /// specified to enable this feature. Also configurable using the "persist-user-preferences" command-line switch. Can be
-            /// overridden for individual RequestContext instances via the RequestContextSettings.PersistUserPreferences value.
-            /// </summary>
-            property bool PersistUserPreferences
-            {
-                bool get() { return _cefSettings->persist_user_preferences == 1; }
-                void set(bool value) { _cefSettings->persist_user_preferences = value; }
-            }
-
             /// <summary>
             /// Comma delimited ordered list of language codes without any whitespace that will be used in the "Accept-Language" HTTP header.
             /// May be set globally using the CefSettings.AcceptLanguageList value. If both values are empty then "en-US,en" will be used.
diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
index dd33e68655..0a1fab68d7 100644
--- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
+++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
@@ -239,7 +239,6 @@
     <ClCompile Include="CookieManager.cpp" />
     <ClCompile Include="Internals\CefBrowserHostWrapper.cpp" />
     <ClCompile Include="Internals\CefContextMenuParamsWrapper.cpp" />
-    <ClCompile Include="Internals\CefExtensionWrapper.cpp" />
     <ClCompile Include="Internals\CefFrameWrapper.cpp" />
     <ClCompile Include="Internals\CefBrowserWrapper.cpp" />
     <ClCompile Include="Internals\CefRefCountManaged.cpp" />
@@ -277,8 +276,6 @@
     <ClInclude Include="Internals\CefRegistrationWrapper.h" />
     <ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
     <ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
-    <ClInclude Include="Internals\CefExtensionHandlerAdapter.h" />
-    <ClInclude Include="Internals\CefExtensionWrapper.h" />
     <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
     <ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
     <ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />
diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters
index 5f6a9aec42..11ece6552f 100644
--- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters
+++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters
@@ -62,9 +62,6 @@
     <ClCompile Include="Internals\CefValueWrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Internals\CefExtensionWrapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="RequestContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -259,12 +256,6 @@
     <ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Internals\CefExtensionWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Internals\CefExtensionHandlerAdapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp
index 7068fe988a..5b8da2a87b 100644
--- a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp
+++ b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp
@@ -9,7 +9,6 @@
 #include "include\cef_parser.h"
 
 #include "Cef.h"
-#include "CefExtensionWrapper.h"
 #include "CefTaskScheduler.h"
 #include "DragData.h"
 #include "CefRunFileDialogCallbackAdapter.h"
@@ -287,20 +286,6 @@ void CefBrowserHostWrapper::ReplaceMisspelling(String^ word)
     _browserHost->ReplaceMisspelling(StringUtils::ToNative(word));
 }
 
-IExtension^ CefBrowserHostWrapper::Extension::get()
-{
-    ThrowIfDisposed();
-
-    auto extension = _browserHost->GetExtension();
-
-    if (extension.get())
-    {
-        return gcnew CefExtensionWrapper(_browserHost->GetExtension());
-    }
-
-    return nullptr;
-}
-
 void CefBrowserHostWrapper::RunFileDialog(CefFileDialogMode mode, String^ title, String^ defaultFilePath, IList<String^>^ acceptFilters, IRunFileDialogCallback^ callback)
 {
     ThrowIfDisposed();
@@ -482,13 +467,6 @@ void CefBrowserHostWrapper::Invalidate(PaintElementType type)
     _browserHost->Invalidate((CefBrowserHost::PaintElementType)type);
 }
 
-bool CefBrowserHostWrapper::IsBackgroundHost::get()
-{
-    ThrowIfDisposed();
-
-    return _browserHost->IsBackgroundHost();
-}
-
 void CefBrowserHostWrapper::ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<CefSharp::Structs::Range> replacementRange, Nullable<CefSharp::Structs::Range> selectionRange)
 {
     ThrowIfDisposed();
diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
index 2f2cd093b9..ca6bb5f5ca 100644
--- a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
@@ -81,11 +81,6 @@ namespace CefSharp
             virtual void AddWordToDictionary(String^ word);
             virtual void ReplaceMisspelling(String^ word);
 
-            virtual property IExtension^ Extension
-            {
-                IExtension^ get();
-            }
-
             virtual void RunFileDialog(CefFileDialogMode mode, String^ title, String^ defaultFilePath, IList<String^>^ acceptFilters, IRunFileDialogCallback^ callback);
 
             virtual void Find(String^ searchText, bool forward, bool matchCase, bool findNext);
@@ -102,11 +97,6 @@ namespace CefSharp
 
             virtual void Invalidate(PaintElementType type);
 
-            virtual property bool IsBackgroundHost
-            {
-                bool get();
-            }
-
             virtual void ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<CefSharp::Structs::Range> replacementRange, Nullable<CefSharp::Structs::Range> selectionRange);
             virtual void ImeCommitText(String^ text, Nullable<CefSharp::Structs::Range> replacementRange, int relativeCursorPos);
             virtual void ImeFinishComposingText(bool keepSelection);
diff --git a/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h
deleted file mode 100644
index 14fa5278d6..0000000000
--- a/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-#pragma once
-
-#include "Stdafx.h"
-
-#include "include\cef_extension.h"
-#include "include\cef_extension_handler.h"
-#include "BrowserSettings.h"
-#include "CefExtensionWrapper.h"
-#include "CefBrowserWrapper.h"
-#include "CefGetExtensionResourceCallbackWrapper.h"
-#include "WindowInfo.h"
-
-using namespace CefSharp;
-
-namespace CefSharp
-{
-    namespace Internals
-    {
-        private class CefExtensionHandlerAdapter : public CefExtensionHandler
-        {
-            gcroot<IExtensionHandler^> _handler;
-
-        public:
-            CefExtensionHandlerAdapter(IExtensionHandler^ handler)
-                : _handler(handler)
-            {
-            }
-
-            ~CefExtensionHandlerAdapter()
-            {
-                delete _handler;
-                _handler = nullptr;
-            }
-
-            ///
-            // Called if the CefRequestContext::LoadExtension request fails. |result| will
-            // be the error code.
-            ///
-            /*--cef()--*/
-            void OnExtensionLoadFailed(cef_errorcode_t result) override
-            {
-                _handler->OnExtensionLoadFailed((CefErrorCode)result);
-            }
-
-            ///
-            // Called if the CefRequestContext::LoadExtension request succeeds.
-            // |extension| is the loaded extension.
-            ///
-            /*--cef()--*/
-            void OnExtensionLoaded(CefRefPtr<CefExtension> extension) override
-            {
-                //TODO: Should this be auto disposed?
-                _handler->OnExtensionLoaded(gcnew CefExtensionWrapper(extension));
-            }
-
-            ///
-            // Called after the CefExtension::Unload request has completed.
-            ///
-            /*--cef()--*/
-            void OnExtensionUnloaded(CefRefPtr<CefExtension> extension) override
-            {
-                //TODO: Add comment to interface saying extension is only valid within the scope
-                //of this method as it's auto disposed
-                CefExtensionWrapper wrapper(extension);
-                _handler->OnExtensionUnloaded(%wrapper);
-            }
-
-            ///
-            // Called when an extension needs a browser to host a background script
-            // specified via the "background" manifest key. The browser will have no
-            // visible window and cannot be displayed. |extension| is the extension that
-            // is loading the background script. |url| is an internally generated
-            // reference to an HTML page that will be used to load the background script
-            // via a <script> src attribute. To allow creation of the browser optionally
-            // modify |client| and |settings| and return false. To cancel creation of the
-            // browser (and consequently cancel load of the background script) return
-            // true. Successful creation will be indicated by a call to
-            // CefLifeSpanHandler::OnAfterCreated, and CefBrowserHost::IsBackgroundHost
-            // will return true for the resulting browser. See
-            // https://developer.chrome.com/extensions/event_pages for more information
-            // about extension background script usage.
-            ///
-            /*--cef()--*/
-            bool OnBeforeBackgroundBrowser(CefRefPtr<CefExtension> extension,
-                const CefString& url,
-                CefRefPtr<CefClient>& client,
-                CefBrowserSettings& settings) override
-            {
-                BrowserSettings browserSettingsWrapper(&settings);
-
-                return _handler->OnBeforeBackgroundBrowser(gcnew CefExtensionWrapper(extension),
-                    StringUtils::ToClr(url),
-                    %browserSettingsWrapper);
-            }
-
-            ///
-            // Called when an extension API (e.g. chrome.tabs.create) requests creation of
-            // a new browser. |extension| and |browser| are the source of the API call.
-            // |active_browser| may optionally be specified via the windowId property or
-            // returned via the GetActiveBrowser() callback and provides the default
-            // |client| and |settings| values for the new browser. |index| is the position
-            // value optionally specified via the index property. |url| is the URL that
-            // will be loaded in the browser. |active| is true if the new browser should
-            // be active when opened.  To allow creation of the browser optionally modify
-            // |windowInfo|, |client| and |settings| and return false. To cancel creation
-            // of the browser return true. Successful creation will be indicated by a call
-            // to CefLifeSpanHandler::OnAfterCreated. Any modifications to |windowInfo|
-            // will be ignored if |active_browser| is wrapped in a CefBrowserView.
-            ///
-            /*--cef()--*/
-            bool OnBeforeBrowser(CefRefPtr<CefExtension> extension,
-                CefRefPtr<CefBrowser> browser,
-                CefRefPtr<CefBrowser> active_browser,
-                int index,
-                const CefString& url,
-                bool active,
-                CefWindowInfo& windowInfo,
-                CefRefPtr<CefClient>& client,
-                CefBrowserSettings& settings) override
-            {
-                BrowserSettings browserSettingsWrapper(&settings);
-
-                return _handler->OnBeforeBrowser(gcnew CefExtensionWrapper(extension),
-                    gcnew CefBrowserWrapper(browser),
-                    gcnew CefBrowserWrapper(active_browser),
-                    index,
-                    StringUtils::ToClr(url),
-                    active,
-                    gcnew WindowInfo(&windowInfo),
-                    %browserSettingsWrapper);
-            }
-
-            ///
-            // Called when no tabId is specified to an extension API call that accepts a
-            // tabId parameter (e.g. chrome.tabs.*). |extension| and |browser| are the
-            // source of the API call. Return the browser that will be acted on by the API
-            // call or return NULL to act on |browser|. The returned browser must share
-            // the same CefRequestContext as |browser|. Incognito browsers should not be
-            // considered unless the source extension has incognito access enabled, in
-            // which case |include_incognito| will be true.
-            ///
-            /*--cef()--*/
-            CefRefPtr<CefBrowser> GetActiveBrowser(
-                CefRefPtr<CefExtension> extension,
-                CefRefPtr<CefBrowser> browser,
-                bool includeIncognito) override
-            {
-                //TODO: Should extension be auto disposed?
-                auto activeBrowser = _handler->GetActiveBrowser(gcnew CefExtensionWrapper(extension),
-                    gcnew CefBrowserWrapper(browser),
-                    includeIncognito);
-
-                if (activeBrowser == nullptr)
-                {
-                    return nullptr;
-                }
-
-                //TODO: CLean this up
-                auto wrapper = static_cast<CefBrowserWrapper^>(activeBrowser);
-
-                return wrapper->Browser.get();
-            }
-
-            ///
-            // Called when the tabId associated with |target_browser| is specified to an
-            // extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-            // |extension| and |browser| are the source of the API call. Return true
-            // to allow access of false to deny access. Access to incognito browsers
-            // should not be allowed unless the source extension has incognito access
-            // enabled, in which case |include_incognito| will be true.
-            ///
-            /*--cef()--*/
-            bool CanAccessBrowser(CefRefPtr<CefExtension> extension,
-                CefRefPtr<CefBrowser> browser,
-                bool includeIncognito,
-                CefRefPtr<CefBrowser> target_browser) override
-            {
-                return _handler->CanAccessBrowser(gcnew CefExtensionWrapper(extension),
-                    gcnew CefBrowserWrapper(browser),
-                    includeIncognito,
-                    gcnew CefBrowserWrapper(target_browser));
-            }
-
-            ///
-            // Called to retrieve an extension resource that would normally be loaded from
-            // disk (e.g. if a file parameter is specified to chrome.tabs.executeScript).
-            // |extension| and |browser| are the source of the resource request. |file| is
-            // the requested relative file path. To handle the resource request return
-            // true and execute |callback| either synchronously or asynchronously. For the
-            // default behavior which reads the resource from the extension directory on
-            // disk return false. Localization substitutions will not be applied to
-            // resources handled via this method.
-            ///
-            /*--cef()--*/
-            bool GetExtensionResource(
-                CefRefPtr<CefExtension> extension,
-                CefRefPtr<CefBrowser> browser,
-                const CefString& file,
-                CefRefPtr<CefGetExtensionResourceCallback> callback) override
-            {
-                return _handler->GetExtensionResource(gcnew CefExtensionWrapper(extension),
-                    gcnew CefBrowserWrapper(browser),
-                    StringUtils::ToClr(file),
-                    gcnew CefGetExtensionResourceCallbackWrapper(callback));
-            }
-
-            IMPLEMENT_REFCOUNTINGM(CefExtensionHandlerAdapter);
-        };
-    }
-}
diff --git a/CefSharp.Core.Runtime/Internals/CefExtensionWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefExtensionWrapper.cpp
deleted file mode 100644
index ec305a493a..0000000000
--- a/CefSharp.Core.Runtime/Internals/CefExtensionWrapper.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-#include "Stdafx.h"
-
-#include "CefExtensionWrapper.h"
-#include "CefValueWrapper.h"
-#include "RequestContext.h"
-
-using namespace CefSharp::Core;
-
-namespace CefSharp
-{
-    namespace Internals
-    {
-        String^ CefExtensionWrapper::Identifier::get()
-        {
-            ThrowIfDisposed();
-
-            return StringUtils::ToClr(_extension->GetIdentifier());
-        }
-
-        String^ CefExtensionWrapper::Path::get()
-        {
-            ThrowIfDisposed();
-
-            return StringUtils::ToClr(_extension->GetPath());
-        }
-
-        IDictionary<String^, IValue^>^ CefExtensionWrapper::Manifest::get()
-        {
-            ThrowIfDisposed();
-
-            auto dictionary = _extension->GetManifest();;
-
-            if (!dictionary.get() || (int)dictionary->GetSize() == 0)
-            {
-                return nullptr;
-            }
-
-            auto result = gcnew Dictionary<String^, IValue^>();
-
-            CefDictionaryValue::KeyList keys;
-            dictionary->GetKeys(keys);
-
-            for (size_t i = 0; i < keys.size(); i++)
-            {
-                auto key = keys[i];
-                auto keyValue = StringUtils::ToClr(key);
-                auto valueWrapper = gcnew CefValueWrapper(dictionary->GetValue(keys[i]));
-
-                result->Add(keyValue, valueWrapper);
-            }
-
-            return result;
-        }
-
-        bool CefExtensionWrapper::IsSame(IExtension^ that)
-        {
-            ThrowIfDisposed();
-
-            return _extension->IsSame(((CefExtensionWrapper^)that)->_extension.get());
-        }
-
-        IRequestContext^ CefExtensionWrapper::LoaderContext::get()
-        {
-            ThrowIfDisposed();
-
-            return gcnew RequestContext(_extension->GetLoaderContext());
-        }
-
-        bool CefExtensionWrapper::IsLoaded::get()
-        {
-            ThrowIfDisposed();
-
-            return _extension->IsLoaded();
-        }
-
-        void CefExtensionWrapper::Unload()
-        {
-            ThrowIfDisposed();
-
-            _extension->Unload();
-        }
-    }
-}
diff --git a/CefSharp.Core.Runtime/Internals/CefExtensionWrapper.h b/CefSharp.Core.Runtime/Internals/CefExtensionWrapper.h
deleted file mode 100644
index ca71f76582..0000000000
--- a/CefSharp.Core.Runtime/Internals/CefExtensionWrapper.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-#pragma once
-
-#include "Stdafx.h"
-
-#include "include\cef_extension.h"
-
-#include "Internals\TypeConversion.h"
-#include "CefValueWrapper.h"
-#include "CefWrapper.h"
-
-using namespace System::Collections::Generic;
-using namespace System::Collections::ObjectModel;
-
-namespace CefSharp
-{
-    namespace Internals
-    {
-        private ref class CefExtensionWrapper : public IExtension, public CefWrapper
-        {
-            MCefRefPtr<CefExtension> _extension;
-
-        internal:
-            CefExtensionWrapper(CefRefPtr<CefExtension> &extension) :
-                _extension(extension)
-            {
-
-            }
-
-            !CefExtensionWrapper()
-            {
-                _extension = nullptr;
-            }
-
-            ~CefExtensionWrapper()
-            {
-                this->!CefExtensionWrapper();
-
-                _disposed = true;
-            }
-
-        public:
-            virtual property String^ Identifier { String^ get(); }
-            virtual property String^ Path { String^ get(); }
-            virtual property IDictionary<String^, IValue^>^ Manifest { IDictionary<String^, IValue^>^ get(); }
-            virtual bool IsSame(IExtension^ that);
-            virtual property IRequestContext^ LoaderContext { IRequestContext^ get(); }
-            virtual property bool IsLoaded { bool get(); }
-            virtual void Unload();            
-        };
-    }
-}
diff --git a/CefSharp.Core.Runtime/Internals/CefNavigationEntryVisitorAdapter.h b/CefSharp.Core.Runtime/Internals/CefNavigationEntryVisitorAdapter.h
index 882e3c5f05..8a125556e7 100644
--- a/CefSharp.Core.Runtime/Internals/CefNavigationEntryVisitorAdapter.h
+++ b/CefSharp.Core.Runtime/Internals/CefNavigationEntryVisitorAdapter.h
@@ -6,6 +6,7 @@
 
 #include "Stdafx.h"
 #include "include\cef_browser.h"
+#include "Internals\TypeConversion.h"
 
 namespace CefSharp
 {
diff --git a/CefSharp.Core.Runtime/RequestContext.cpp b/CefSharp.Core.Runtime/RequestContext.cpp
index ae4bf1cfb5..0e45873f7e 100644
--- a/CefSharp.Core.Runtime/RequestContext.cpp
+++ b/CefSharp.Core.Runtime/RequestContext.cpp
@@ -10,8 +10,6 @@
 #include "CookieManager.h"
 #include "Internals\CefSchemeHandlerFactoryAdapter.h"
 #include "Internals\CefCompletionCallbackAdapter.h"
-#include "Internals\CefExtensionWrapper.h"
-#include "Internals\CefExtensionHandlerAdapter.h"
 #include "Internals\CefResolveCallbackAdapter.h"
 #include "Internals\TypeConversion.h"
 
@@ -166,83 +164,6 @@ namespace CefSharp
             return callback->Task;
         }
 
-        bool RequestContext::DidLoadExtension(String^ extensionId)
-        {
-            ThrowIfDisposed();
-
-            ThrowIfExecutedOnNonCefUiThread();
-
-            return _requestContext->DidLoadExtension(StringUtils::ToNative(extensionId));
-        }
-
-        IExtension^ RequestContext::GetExtension(String^ extensionId)
-        {
-            ThrowIfDisposed();
-
-            ThrowIfExecutedOnNonCefUiThread();
-
-            auto extension = _requestContext->GetExtension(StringUtils::ToNative(extensionId));
-
-            if (extension.get())
-            {
-                return gcnew CefExtensionWrapper(extension);
-            }
-
-            return nullptr;
-        }
-
-        bool RequestContext::GetExtensions([Out] IList<String^>^ %extensionIds)
-        {
-            ThrowIfDisposed();
-
-            ThrowIfExecutedOnNonCefUiThread();
-
-            std::vector<CefString> extensions;
-
-            auto success = _requestContext->GetExtensions(extensions);
-
-            extensionIds = StringUtils::ToClr(extensions);
-
-            return success;
-        }
-
-        bool RequestContext::HasExtension(String^ extensionId)
-        {
-            ThrowIfDisposed();
-
-            ThrowIfExecutedOnNonCefUiThread();
-
-            return _requestContext->HasExtension(StringUtils::ToNative(extensionId));
-        }
-
-        void RequestContext::LoadExtension(String^ rootDirectory, String^ manifestJson, IExtensionHandler^ handler)
-        {
-            ThrowIfDisposed();
-
-            CefRefPtr<CefDictionaryValue> manifest;
-
-            if (!String::IsNullOrEmpty(manifestJson))
-            {
-                CefString errorMessage;
-                auto value = CefParseJSONAndReturnError(StringUtils::ToNative(manifestJson),
-                    cef_json_parser_options_t::JSON_PARSER_ALLOW_TRAILING_COMMAS,
-                    errorMessage);
-
-                if (value.get())
-                {
-                    manifest = value->GetDictionary();
-                }
-                else
-                {
-                    throw gcnew Exception("Unable to parse JSON - ErrorMessage:" + StringUtils::ToClr(errorMessage));
-                }
-            }
-
-            CefRefPtr<CefExtensionHandler> extensionHandler = handler == nullptr ? nullptr : new CefExtensionHandlerAdapter(handler);
-
-            _requestContext->LoadExtension(StringUtils::ToNative(rootDirectory), manifest, extensionHandler);
-        }
-
         IRequestContext^ RequestContext::UnWrap()
         {
             return this;
diff --git a/CefSharp.Core.Runtime/RequestContext.h b/CefSharp.Core.Runtime/RequestContext.h
index 06d5352856..d24ef5bcf2 100644
--- a/CefSharp.Core.Runtime/RequestContext.h
+++ b/CefSharp.Core.Runtime/RequestContext.h
@@ -306,88 +306,6 @@ namespace CefSharp
             /// <returns>A task that represents the Resoolve Host operation. The value of the TResult parameter contains ResolveCallbackResult.</returns>
             virtual Task<ResolveCallbackResult>^ ResolveHostAsync(Uri^ origin);
 
-            /// <summary>
-            /// Returns true if this context was used to load the extension identified by extensionId. Other contexts sharing the same storage will also have access to the extension (see HasExtension).
-            /// This method must be called on the CEF UI thread.
-            /// </summary>
-            /// <returns>Returns true if this context was used to load the extension identified by extensionId</returns>
-            /// <remarks>Use Cef.UIThreadTaskFactory to execute this method if required,
-            /// <see cref="IBrowserProcessHandler::OnContextInitialized"/> and ChromiumWebBrowser.IsBrowserInitializedChanged are both
-            /// executed on the CEF UI thread, so can be called directly.
-            /// When CefSettings.MultiThreadedMessageLoop == false (the default is true) then the main
-            /// application thread will be the CEF UI thread.</remarks>
-            virtual bool DidLoadExtension(String^ extensionId);
-
-            /// <summary>
-            /// Returns the extension matching extensionId or null if no matching extension is accessible in this context (see HasExtension).
-            /// This method must be called on the CEF UI thread.
-            /// </summary>
-            /// <param name="extensionId">extension Id</param>
-            /// <returns>Returns the extension matching extensionId or null if no matching extension is accessible in this context</returns>
-            /// <remarks>Use Cef.UIThreadTaskFactory to execute this method if required,
-            /// <see cref="IBrowserProcessHandler::OnContextInitialized"/> and ChromiumWebBrowser.IsBrowserInitializedChanged are both
-            /// executed on the CEF UI thread, so can be called directly.
-            /// When CefSettings.MultiThreadedMessageLoop == false (the default is true) then the main
-            /// application thread will be the CEF UI thread.</remarks>
-            virtual IExtension^ GetExtension(String^ extensionId);
-
-            /// <summary>
-            /// Retrieve the list of all extensions that this context has access to (see HasExtension).
-            /// <paramref name="extensionIds"/> will be populated with the list of extension ID values.
-            /// This method must be called on the CEF UI thread.
-            /// </summary>
-            /// <param name="extensionIds">output a list of extensions Ids</param>
-            /// <returns>returns true on success otherwise false</returns>
-            /// <remarks>Use Cef.UIThreadTaskFactory to execute this method if required,
-            /// <see cref="IBrowserProcessHandler::OnContextInitialized"/> and ChromiumWebBrowser.IsBrowserInitializedChanged are both
-            /// executed on the CEF UI thread, so can be called directly.
-            /// When CefSettings.MultiThreadedMessageLoop == false (the default is true) then the main
-            /// application thread will be the CEF UI thread.</remarks>
-            virtual bool GetExtensions([Out] IList<String^>^ %extensionIds);
-
-            /// <summary>
-            /// Returns true if this context has access to the extension identified by extensionId.
-            /// This may not be the context that was used to load the extension (see DidLoadExtension).
-            /// This method must be called on the CEF UI thread.
-            /// </summary>
-            /// <param name="extensionId">extension id</param>
-            /// <returns>Returns true if this context has access to the extension identified by extensionId</returns>
-            /// <remarks>Use Cef.UIThreadTaskFactory to execute this method if required,
-            /// <see cref="IBrowserProcessHandler::OnContextInitialized"/> and ChromiumWebBrowser.IsBrowserInitializedChanged are both
-            /// executed on the CEF UI thread, so can be called directly.
-            /// When CefSettings.MultiThreadedMessageLoop == false (the default is true) then the main
-            /// application thread will be the CEF UI thread.</remarks>
-            virtual bool HasExtension(String^ extensionId);
-
-            /// <summary>
-            /// Load an extension. If extension resources will be read from disk using the default load implementation then rootDirectoy
-            /// should be the absolute path to the extension resources directory and manifestJson should be null.
-            /// If extension resources will be provided by the client (e.g. via IRequestHandler and/or IExtensionHandler) then rootDirectory
-            /// should be a path component unique to the extension (if not absolute this will be internally prefixed with the PK_DIR_RESOURCES path)
-            /// and manifestJson should contain the contents that would otherwise be read from the "manifest.json" file on disk.
-            /// The loaded extension will be accessible in all contexts sharing the same storage (HasExtension returns true).
-            /// However, only the context on which this method was called is considered the loader (DidLoadExtension returns true) and only the
-            /// loader will receive IRequestContextHandler callbacks for the extension. <see cref="IExtensionHandler::OnExtensionLoaded"/> will be
-            /// called on load success or <see cref="IExtensionHandler::OnExtensionLoadFailed"/> will be called on load failure.
-            /// If the extension specifies a background script via the "background" manifest key then <see cref="IExtensionHandler::OnBeforeBackgroundBrowser"/>
-            /// will be called to create the background browser. See that method for additional information about background scripts.
-            /// For visible extension views the client application should evaluate the manifest to determine the correct extension URL to load and then pass
-            /// that URL to the IBrowserHost.CreateBrowser* function after the extension has loaded. For example, the client can look for the "browser_action"
-            /// manifest key as documented at https://developer.chrome.com/extensions/browserAction. Extension URLs take the form "chrome-extension:///".
-            /// Browsers that host extensions differ from normal browsers as follows: - Can access chrome.* JavaScript APIs if allowed by the manifest.
-            /// Visit chrome://extensions-support for the list of extension APIs currently supported by CEF. - Main frame navigation to non-extension
-            /// content is blocked.
-            /// - Pinch-zooming is disabled.
-            /// - <see cref="IBrowserHost::Extension"/> returns the hosted extension.
-            /// - CefBrowserHost::IsBackgroundHost returns true for background hosts. See https://developer.chrome.com/extensions for extension implementation and usage documentation.
-            /// </summary>
-            /// <param name="rootDirectory">If extension resources will be read from disk using the default load implementation then rootDirectoy
-            /// should be the absolute path to the extension resources directory and manifestJson should be null</param>
-            /// <param name="manifestJson">If extension resources will be provided by the client then rootDirectory should be a path component unique to the extension
-            /// and manifestJson should contain the contents that would otherwise be read from the manifest.json file on disk</param>
-            /// <param name="handler">handle events related to browser extensions</param>
-            virtual void LoadExtension(String^ rootDirectory, String^ manifestJson, IExtensionHandler^ handler);
-
             /// <summary>
             /// Gets the inner most instance
             /// </summary>
diff --git a/CefSharp.Core.Runtime/RequestContextSettings.h b/CefSharp.Core.Runtime/RequestContextSettings.h
index 43fa731cd8..f933d247d7 100644
--- a/CefSharp.Core.Runtime/RequestContextSettings.h
+++ b/CefSharp.Core.Runtime/RequestContextSettings.h
@@ -58,18 +58,6 @@ namespace CefSharp
                 void set(bool value) { _settings->persist_session_cookies = value; }
             }
 
-            /// <summary>
-            /// To persist user preferences as a JSON file in the cache path directory set
-            /// this value to true. Can be set globally using the
-            /// CefSettings.PersistUserPreferences value. This value will be ignored if
-            /// CachePath is empty or if it matches the CefSettings.CachePath value.
-            /// </summary>
-            property bool PersistUserPreferences
-            {
-                bool get() { return _settings->persist_user_preferences == 1; }
-                void set(bool value) { _settings->persist_user_preferences = value; }
-            }
-
             /// <summary>
             /// The location where cache data for this request context will be stored on
             /// disk. If this value is non-empty then it must be an absolute path that is
diff --git a/CefSharp.Core/CefSettingsBase.cs b/CefSharp.Core/CefSettingsBase.cs
index a8ac07fdcb..63e3b7586b 100644
--- a/CefSharp.Core/CefSettingsBase.cs
+++ b/CefSharp.Core/CefSettingsBase.cs
@@ -69,18 +69,6 @@ public CommandLineArgDictionary CefCommandLineArgs
             get { return settings.CefCommandLineArgs; }
         }
 
-        /// <summary>
-        /// Set to true to enable use of the Chrome runtime in CEF. This will
-        /// be removed in version 128 (as the Chrome Bootstrap will used in all cases).
-        /// See issue https://github.com/chromiumembedded/cef/issues/3685
-        /// </summary>
-        [Obsolete("ChromeRuntime propery will be removed in M128. It's being removed upstream see https://github.com/cefsharp/CefSharp/issues/4795")]
-        public bool ChromeRuntime
-        {
-            get { return settings.ChromeRuntime; }
-            set { settings.ChromeRuntime = value; }
-        }
-
         /// <summary>
         /// Set to true to disable configuration of browser process features using standard CEF and Chromium command-line arguments.
         /// Configuration can still be specified using CEF data structures or by adding to CefCommandLineArgs.
@@ -245,17 +233,6 @@ public string JavascriptFlags
             set { settings.JavascriptFlags = value; }
         }
 
-        /// <summary>
-        /// Set to true to disable loading of pack files for resources and locales. A resource bundle handler must be provided for the
-        /// browser and render processes via CefApp.GetResourceBundleHandler() if loading of pack files is disabled. Also configurable
-        /// using the "disable-pack-loading" command- line switch.
-        /// </summary>
-        public bool PackLoadingDisabled
-        {
-            get { return settings.PackLoadingDisabled; }
-            set { settings.PackLoadingDisabled = value; }
-        }
-
         /// <summary>
         /// Value that will be inserted as the product portion of the default User-Agent string. If empty the Chromium product version
         /// will be used. If UserAgent is specified this value will be ignored. Also configurable using the "user-agent-product" command-
@@ -322,17 +299,6 @@ public bool PersistSessionCookies
             set { settings.PersistSessionCookies = value; }
         }
 
-        /// <summary>
-        /// To persist user preferences as a JSON file in the cache path directory set this value to true. A CachePath value must also be
-        /// specified to enable this feature. Also configurable using the "persist-user-preferences" command-line switch. Can be
-        /// overridden for individual RequestContext instances via the RequestContextSettings.PersistUserPreferences value.
-        /// </summary>
-        public bool PersistUserPreferences
-        {
-            get { return settings.PersistUserPreferences; }
-            set { settings.PersistUserPreferences = value; }
-        }
-
         /// <summary>
         /// Comma delimited ordered list of language codes without any whitespace that will be used in the "Accept-Language" HTTP header.
         /// May be set globally using the CefSettings.AcceptLanguageList value. If both values are empty then "en-US,en" will be used.
diff --git a/CefSharp.Core/RequestContext.cs b/CefSharp.Core/RequestContext.cs
index 4023cc7a05..a066be4ad1 100644
--- a/CefSharp.Core/RequestContext.cs
+++ b/CefSharp.Core/RequestContext.cs
@@ -197,46 +197,6 @@ public Task<ResolveCallbackResult> ResolveHostAsync(Uri origin)
             return requestContext.ResolveHostAsync(origin);
         }
 
-        /// <inheritdoc/>
-        public bool DidLoadExtension(string extensionId)
-        {
-            return requestContext.DidLoadExtension(extensionId);
-        }
-
-        /// <inheritdoc/>
-        public IExtension GetExtension(string extensionId)
-        {
-            return requestContext.GetExtension(extensionId);
-        }
-
-        /// <inheritdoc/>
-        public bool GetExtensions(out IList<string> extensionIds)
-        {
-            return requestContext.GetExtensions(out extensionIds);
-        }
-
-        /// <inheritdoc/>
-        public bool HasExtension(string extensionId)
-        {
-            return requestContext.CanSetPreference(extensionId);
-        }
-
-        /// <inheritdoc/>
-        public void LoadExtension(string rootDirectory, string manifestJson, IExtensionHandler handler)
-        {
-            if (Cef.CurrentlyOnThread(CefThreadIds.TID_UI))
-            {
-                requestContext.LoadExtension(rootDirectory, manifestJson, handler);
-            }
-            else
-            {
-                Cef.UIThreadTaskFactory.StartNew(() =>
-                {
-                    requestContext.LoadExtension(rootDirectory, manifestJson, handler);
-                });
-            }
-        }
-
         /// <inheritdoc/>
         public void Dispose()
         {
diff --git a/CefSharp.Core/RequestContextBuilder.cs b/CefSharp.Core/RequestContextBuilder.cs
index b5969d5c04..adaa269f06 100644
--- a/CefSharp.Core/RequestContextBuilder.cs
+++ b/CefSharp.Core/RequestContextBuilder.cs
@@ -30,7 +30,7 @@ void ThrowExceptionIfCustomSettingSpecified()
         {
             if (_settings != null)
             {
-                throw new Exception("A call to WithCachePath/PersistUserPreferences has already been made, it's not possible to share settings with another RequestContext.");
+                throw new Exception("A call to WithCachePath has already been made, it's not possible to share settings with another RequestContext.");
             }
         }
         /// <summary>
@@ -102,26 +102,6 @@ public RequestContextBuilder WithCachePath(string cachePath)
             return this;
         }
 
-        /// <summary>
-        /// Invoke this method tp persist user preferences as a JSON file in the cache path directory.
-        /// Can be set globally using the CefSettings.PersistUserPreferences value.
-        /// This value will be ignored if CachePath is empty or if it matches the CefSettings.CachePath value.
-        /// </summary>
-        /// <returns>Returns RequestContextBuilder instance</returns>
-        public RequestContextBuilder PersistUserPreferences()
-        {
-            ThrowExceptionIfContextAlreadySet();
-
-            if (_settings == null)
-            {
-                _settings = new RequestContextSettings();
-            }
-
-            _settings.PersistUserPreferences = true;
-
-            return this;
-        }
-
         /// <summary>
         /// Set the value associated with preference name when the RequestContext
         /// is initialzied. If value is null the preference will be restored to its
diff --git a/CefSharp.Core/RequestContextSettings.cs b/CefSharp.Core/RequestContextSettings.cs
index 567aec53f1..76b7e7d07f 100644
--- a/CefSharp.Core/RequestContextSettings.cs
+++ b/CefSharp.Core/RequestContextSettings.cs
@@ -29,18 +29,6 @@ public bool PersistSessionCookies
             set { settings.PersistSessionCookies = value; }
         }
 
-        /// <summary>
-        /// To persist user preferences as a JSON file in the cache path directory set
-        /// this value to true. Can be set globally using the
-        /// CefSettings.PersistUserPreferences value. This value will be ignored if
-        /// CachePath is empty or if it matches the CefSettings.CachePath value.
-        /// </summary>
-        public bool PersistUserPreferences
-        {
-            get { return settings.PersistUserPreferences; }
-            set { settings.PersistUserPreferences = value; }
-        }
-
         /// <summary>
         /// The location where cache data for this request context will be stored on
         /// disk. If this value is non-empty then it must be an absolute path that is
diff --git a/CefSharp.Example/Handlers/ExtensionHandler.cs b/CefSharp.Example/Handlers/ExtensionHandler.cs
deleted file mode 100644
index 5a5947bbec..0000000000
--- a/CefSharp.Example/Handlers/ExtensionHandler.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-using System;
-
-namespace CefSharp.Example.Handlers
-{
-    public class ExtensionHandler : IExtensionHandler
-    {
-        public Func<IExtension, bool, IBrowser> GetActiveBrowser;
-        public Action<string> LoadExtensionPopup;
-
-        public void Dispose()
-        {
-            GetActiveBrowser = null;
-            LoadExtensionPopup = null;
-        }
-
-        bool IExtensionHandler.CanAccessBrowser(IExtension extension, IBrowser browser, bool includeIncognito, IBrowser targetBrowser)
-        {
-            return false;
-        }
-
-        IBrowser IExtensionHandler.GetActiveBrowser(IExtension extension, IBrowser browser, bool includeIncognito)
-        {
-            return GetActiveBrowser?.Invoke(extension, includeIncognito);
-            return null;
-        }
-
-        bool IExtensionHandler.GetExtensionResource(IExtension extension, IBrowser browser, string file, IGetExtensionResourceCallback callback)
-        {
-            return false;
-        }
-
-        bool IExtensionHandler.OnBeforeBackgroundBrowser(IExtension extension, string url, IBrowserSettings settings)
-        {
-            return false;
-        }
-
-        bool IExtensionHandler.OnBeforeBrowser(IExtension extension, IBrowser browser, IBrowser activeBrowser, int index, string url, bool active, IWindowInfo windowInfo, IBrowserSettings settings)
-        {
-            return false;
-        }
-
-        void IExtensionHandler.OnExtensionLoaded(IExtension extension)
-        {
-            var manifest = extension.Manifest;
-            var browserAction = manifest["browser_action"].GetDictionary();
-            if (browserAction.ContainsKey("default_popup"))
-            {
-                var popupUrl = browserAction["default_popup"].GetString();
-
-                popupUrl = "chrome-extension://" + extension.Identifier + "/" + popupUrl;
-
-                LoadExtensionPopup?.Invoke(popupUrl);
-            }
-        }
-
-        void IExtensionHandler.OnExtensionLoadFailed(CefErrorCode errorCode)
-        {
-            
-        }
-
-        void IExtensionHandler.OnExtensionUnloaded(IExtension extension)
-        {
-            
-        }
-    }
-}
diff --git a/CefSharp.OffScreen/CefSettings.cs b/CefSharp.OffScreen/CefSettings.cs
index 8c2b073bed..fabca13eff 100644
--- a/CefSharp.OffScreen/CefSettings.cs
+++ b/CefSharp.OffScreen/CefSettings.cs
@@ -16,7 +16,6 @@ public class CefSettings : CefSettingsBase
         public CefSettings() : base()
         {
             WindowlessRenderingEnabled = true;
-            ChromeRuntime = true;
 
             //For OffScreen it doesn't make much sense to enable audio by default, so we disable it.
             //this can be removed in user code if required
diff --git a/CefSharp.WinForms.Example/BrowserForm.Designer.cs b/CefSharp.WinForms.Example/BrowserForm.Designer.cs
index e562cc056d..90b0548dc9 100644
--- a/CefSharp.WinForms.Example/BrowserForm.Designer.cs
+++ b/CefSharp.WinForms.Example/BrowserForm.Designer.cs
@@ -37,6 +37,7 @@ private void InitializeComponent()
             this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.printToPdfToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.takeScreenShotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.showDevToolsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.showDevToolsDockedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.closeDevToolsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -68,10 +69,8 @@ private void InitializeComponent()
             this.openDataUrlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.httpbinorgToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.runFileDialogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.loadExtensionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.javascriptBindingStressTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.browserTabControl = new System.Windows.Forms.TabControl();
-            this.takeScreenShotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -86,7 +85,7 @@ private void InitializeComponent()
             this.testToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(730, 24);
+            this.menuStrip1.Size = new System.Drawing.Size(973, 28);
             this.menuStrip1.TabIndex = 1;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -106,14 +105,14 @@ private void InitializeComponent()
             this.toolStripMenuItem3,
             this.exitToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);
             this.fileToolStripMenuItem.Text = "&File";
             // 
             // newTabToolStripMenuItem
             // 
             this.newTabToolStripMenuItem.Name = "newTabToolStripMenuItem";
             this.newTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
-            this.newTabToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.newTabToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.newTabToolStripMenuItem.Text = "&New Tab";
             this.newTabToolStripMenuItem.Click += new System.EventHandler(this.NewTabToolStripMenuItemClick);
             // 
@@ -121,68 +120,75 @@ private void InitializeComponent()
             // 
             this.closeTabToolStripMenuItem.Name = "closeTabToolStripMenuItem";
             this.closeTabToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W)));
-            this.closeTabToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.closeTabToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.closeTabToolStripMenuItem.Text = "&Close Tab";
             this.closeTabToolStripMenuItem.Click += new System.EventHandler(this.CloseTabToolStripMenuItemClick);
             // 
             // hideScrollbarsMenuItem
             // 
             this.hideScrollbarsMenuItem.Name = "hideScrollbarsMenuItem";
-            this.hideScrollbarsMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.hideScrollbarsMenuItem.Size = new System.Drawing.Size(262, 26);
             this.hideScrollbarsMenuItem.Text = "Hide Scrollbars";
             this.hideScrollbarsMenuItem.Click += new System.EventHandler(this.HideScrollbarsToolStripMenuItemClick);
             // 
             // printToolStripMenuItem
             // 
             this.printToolStripMenuItem.Name = "printToolStripMenuItem";
-            this.printToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.printToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.printToolStripMenuItem.Text = "&Print";
             this.printToolStripMenuItem.Click += new System.EventHandler(this.PrintToolStripMenuItemClick);
             // 
             // printToPdfToolStripMenuItem
             // 
             this.printToPdfToolStripMenuItem.Name = "printToPdfToolStripMenuItem";
-            this.printToPdfToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.printToPdfToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.printToPdfToolStripMenuItem.Text = "Print To Pdf";
             this.printToPdfToolStripMenuItem.Click += new System.EventHandler(this.PrintToPdfToolStripMenuItemClick);
             // 
             // aboutToolStripMenuItem
             // 
             this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.aboutToolStripMenuItem.Text = "About";
             this.aboutToolStripMenuItem.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
             // 
+            // takeScreenShotMenuItem
+            // 
+            this.takeScreenShotMenuItem.Name = "takeScreenShotMenuItem";
+            this.takeScreenShotMenuItem.Size = new System.Drawing.Size(262, 26);
+            this.takeScreenShotMenuItem.Text = "Take Screenshot";
+            this.takeScreenShotMenuItem.Click += new System.EventHandler(this.TakeScreenShotMenuItemClick);
+            // 
             // showDevToolsMenuItem
             // 
             this.showDevToolsMenuItem.Name = "showDevToolsMenuItem";
-            this.showDevToolsMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.showDevToolsMenuItem.Size = new System.Drawing.Size(262, 26);
             this.showDevToolsMenuItem.Text = "Show Dev Tools (Default)";
             this.showDevToolsMenuItem.Click += new System.EventHandler(this.ShowDevToolsMenuItemClick);
             // 
             // showDevToolsDockedToolStripMenuItem
             // 
             this.showDevToolsDockedToolStripMenuItem.Name = "showDevToolsDockedToolStripMenuItem";
-            this.showDevToolsDockedToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.showDevToolsDockedToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.showDevToolsDockedToolStripMenuItem.Text = "Show Dev Tools (Docked)";
             this.showDevToolsDockedToolStripMenuItem.Click += new System.EventHandler(this.ShowDevToolsDockedMenuItemClick);
             // 
             // closeDevToolsMenuItem
             // 
             this.closeDevToolsMenuItem.Name = "closeDevToolsMenuItem";
-            this.closeDevToolsMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.closeDevToolsMenuItem.Size = new System.Drawing.Size(262, 26);
             this.closeDevToolsMenuItem.Text = "Close Dev Tools";
             this.closeDevToolsMenuItem.Click += new System.EventHandler(this.CloseDevToolsMenuItemClick);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(204, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(259, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(207, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(262, 26);
             this.exitToolStripMenuItem.Text = "Exit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitMenuItemClick);
             // 
@@ -201,79 +207,79 @@ private void InitializeComponent()
             this.toolStripSeparator1,
             this.copySourceToClipBoardAsyncMenuItem});
             this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(49, 24);
             this.editToolStripMenuItem.Text = "Edit";
             // 
             // undoMenuItem
             // 
             this.undoMenuItem.Name = "undoMenuItem";
-            this.undoMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.undoMenuItem.Size = new System.Drawing.Size(313, 26);
             this.undoMenuItem.Text = "Undo";
             this.undoMenuItem.Click += new System.EventHandler(this.UndoMenuItemClick);
             // 
             // redoMenuItem
             // 
             this.redoMenuItem.Name = "redoMenuItem";
-            this.redoMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.redoMenuItem.Size = new System.Drawing.Size(313, 26);
             this.redoMenuItem.Text = "Redo";
             this.redoMenuItem.Click += new System.EventHandler(this.RedoMenuItemClick);
             // 
             // findMenuItem
             // 
             this.findMenuItem.Name = "findMenuItem";
-            this.findMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.findMenuItem.Size = new System.Drawing.Size(313, 26);
             this.findMenuItem.Text = "Find";
             this.findMenuItem.Click += new System.EventHandler(this.FindMenuItemClick);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(248, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(310, 6);
             // 
             // cutMenuItem
             // 
             this.cutMenuItem.Name = "cutMenuItem";
-            this.cutMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.cutMenuItem.Size = new System.Drawing.Size(313, 26);
             this.cutMenuItem.Text = "Cut";
             this.cutMenuItem.Click += new System.EventHandler(this.CutMenuItemClick);
             // 
             // copyMenuItem
             // 
             this.copyMenuItem.Name = "copyMenuItem";
-            this.copyMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.copyMenuItem.Size = new System.Drawing.Size(313, 26);
             this.copyMenuItem.Text = "Copy";
             this.copyMenuItem.Click += new System.EventHandler(this.CopyMenuItemClick);
             // 
             // pasteMenuItem
             // 
             this.pasteMenuItem.Name = "pasteMenuItem";
-            this.pasteMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.pasteMenuItem.Size = new System.Drawing.Size(313, 26);
             this.pasteMenuItem.Text = "Paste";
             this.pasteMenuItem.Click += new System.EventHandler(this.PasteMenuItemClick);
             // 
             // deleteMenuItem
             // 
             this.deleteMenuItem.Name = "deleteMenuItem";
-            this.deleteMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.deleteMenuItem.Size = new System.Drawing.Size(313, 26);
             this.deleteMenuItem.Text = "Delete";
             this.deleteMenuItem.Click += new System.EventHandler(this.DeleteMenuItemClick);
             // 
             // selectAllMenuItem
             // 
             this.selectAllMenuItem.Name = "selectAllMenuItem";
-            this.selectAllMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.selectAllMenuItem.Size = new System.Drawing.Size(313, 26);
             this.selectAllMenuItem.Text = "Select All";
             this.selectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItemClick);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(248, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(310, 6);
             // 
             // copySourceToClipBoardAsyncMenuItem
             // 
             this.copySourceToClipBoardAsyncMenuItem.Name = "copySourceToClipBoardAsyncMenuItem";
-            this.copySourceToClipBoardAsyncMenuItem.Size = new System.Drawing.Size(251, 22);
+            this.copySourceToClipBoardAsyncMenuItem.Size = new System.Drawing.Size(313, 26);
             this.copySourceToClipBoardAsyncMenuItem.Text = "Copy Source to Clipboard (async)";
             this.copySourceToClipBoardAsyncMenuItem.Click += new System.EventHandler(this.CopySourceToClipBoardAsyncClick);
             // 
@@ -284,27 +290,27 @@ private void InitializeComponent()
             this.zoomOutToolStripMenuItem,
             this.currentZoomLevelToolStripMenuItem});
             this.zoomLevelToolStripMenuItem.Name = "zoomLevelToolStripMenuItem";
-            this.zoomLevelToolStripMenuItem.Size = new System.Drawing.Size(81, 20);
+            this.zoomLevelToolStripMenuItem.Size = new System.Drawing.Size(101, 24);
             this.zoomLevelToolStripMenuItem.Text = "Zoom Level";
             // 
             // zoomInToolStripMenuItem
             // 
             this.zoomInToolStripMenuItem.Name = "zoomInToolStripMenuItem";
-            this.zoomInToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
+            this.zoomInToolStripMenuItem.Size = new System.Drawing.Size(222, 26);
             this.zoomInToolStripMenuItem.Text = "Zoom In";
             this.zoomInToolStripMenuItem.Click += new System.EventHandler(this.ZoomInToolStripMenuItemClick);
             // 
             // zoomOutToolStripMenuItem
             // 
             this.zoomOutToolStripMenuItem.Name = "zoomOutToolStripMenuItem";
-            this.zoomOutToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
+            this.zoomOutToolStripMenuItem.Size = new System.Drawing.Size(222, 26);
             this.zoomOutToolStripMenuItem.Text = "Zoom Out";
             this.zoomOutToolStripMenuItem.Click += new System.EventHandler(this.ZoomOutToolStripMenuItemClick);
             // 
             // currentZoomLevelToolStripMenuItem
             // 
             this.currentZoomLevelToolStripMenuItem.Name = "currentZoomLevelToolStripMenuItem";
-            this.currentZoomLevelToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
+            this.currentZoomLevelToolStripMenuItem.Size = new System.Drawing.Size(222, 26);
             this.currentZoomLevelToolStripMenuItem.Text = "Current Zoom Level";
             this.currentZoomLevelToolStripMenuItem.Click += new System.EventHandler(this.CurrentZoomLevelToolStripMenuItemClick);
             // 
@@ -315,20 +321,20 @@ private void InitializeComponent()
             this.doesElementWithIDExistToolStripMenuItem,
             this.listenForButtonClickToolStripMenuItem});
             this.scriptToolStripMenuItem.Name = "scriptToolStripMenuItem";
-            this.scriptToolStripMenuItem.Size = new System.Drawing.Size(49, 20);
+            this.scriptToolStripMenuItem.Size = new System.Drawing.Size(61, 24);
             this.scriptToolStripMenuItem.Text = "Script";
             // 
             // isTextInputToolStripMenuItem
             // 
             this.isTextInputToolStripMenuItem.Name = "isTextInputToolStripMenuItem";
-            this.isTextInputToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
+            this.isTextInputToolStripMenuItem.Size = new System.Drawing.Size(342, 26);
             this.isTextInputToolStripMenuItem.Text = "Does active element accept text input";
             this.isTextInputToolStripMenuItem.Click += new System.EventHandler(this.DoesActiveElementAcceptTextInputToolStripMenuItemClick);
             // 
             // doesElementWithIDExistToolStripMenuItem
             // 
             this.doesElementWithIDExistToolStripMenuItem.Name = "doesElementWithIDExistToolStripMenuItem";
-            this.doesElementWithIDExistToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
+            this.doesElementWithIDExistToolStripMenuItem.Size = new System.Drawing.Size(342, 26);
             this.doesElementWithIDExistToolStripMenuItem.Text = "Does element with ID exist";
             this.doesElementWithIDExistToolStripMenuItem.Click += new System.EventHandler(this.DoesElementWithIdExistToolStripMenuItemClick);
             // 
@@ -338,20 +344,20 @@ private void InitializeComponent()
             this.goToDemoPageToolStripMenuItem,
             this.injectJavascriptCodeToolStripMenuItem});
             this.listenForButtonClickToolStripMenuItem.Name = "listenForButtonClickToolStripMenuItem";
-            this.listenForButtonClickToolStripMenuItem.Size = new System.Drawing.Size(272, 22);
+            this.listenForButtonClickToolStripMenuItem.Size = new System.Drawing.Size(342, 26);
             this.listenForButtonClickToolStripMenuItem.Text = "Listen for button click";
             // 
             // goToDemoPageToolStripMenuItem
             // 
             this.goToDemoPageToolStripMenuItem.Name = "goToDemoPageToolStripMenuItem";
-            this.goToDemoPageToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+            this.goToDemoPageToolStripMenuItem.Size = new System.Drawing.Size(233, 26);
             this.goToDemoPageToolStripMenuItem.Text = "Go to demo page";
             this.goToDemoPageToolStripMenuItem.Click += new System.EventHandler(this.GoToDemoPageToolStripMenuItemClick);
             // 
             // injectJavascriptCodeToolStripMenuItem
             // 
             this.injectJavascriptCodeToolStripMenuItem.Name = "injectJavascriptCodeToolStripMenuItem";
-            this.injectJavascriptCodeToolStripMenuItem.Size = new System.Drawing.Size(186, 22);
+            this.injectJavascriptCodeToolStripMenuItem.Size = new System.Drawing.Size(233, 26);
             this.injectJavascriptCodeToolStripMenuItem.Text = "Inject Javascript code";
             this.injectJavascriptCodeToolStripMenuItem.Click += new System.EventHandler(this.InjectJavascriptCodeToolStripMenuItemClick);
             // 
@@ -361,72 +367,59 @@ private void InitializeComponent()
             this.openDataUrlToolStripMenuItem,
             this.httpbinorgToolStripMenuItem,
             this.runFileDialogToolStripMenuItem,
-            this.loadExtensionsToolStripMenuItem,
             this.javascriptBindingStressTestToolStripMenuItem});
             this.testToolStripMenuItem.Name = "testToolStripMenuItem";
-            this.testToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+            this.testToolStripMenuItem.Size = new System.Drawing.Size(49, 24);
             this.testToolStripMenuItem.Text = "Test";
             // 
             // openDataUrlToolStripMenuItem
             // 
             this.openDataUrlToolStripMenuItem.Name = "openDataUrlToolStripMenuItem";
-            this.openDataUrlToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
+            this.openDataUrlToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
             this.openDataUrlToolStripMenuItem.Text = "Open Data Url";
             this.openDataUrlToolStripMenuItem.Click += new System.EventHandler(this.OpenDataUrlToolStripMenuItemClick);
             // 
             // httpbinorgToolStripMenuItem
             // 
             this.httpbinorgToolStripMenuItem.Name = "httpbinorgToolStripMenuItem";
-            this.httpbinorgToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
+            this.httpbinorgToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
             this.httpbinorgToolStripMenuItem.Text = "httpbin.org";
             this.httpbinorgToolStripMenuItem.Click += new System.EventHandler(this.OpenHttpBinOrgToolStripMenuItemClick);
             // 
             // runFileDialogToolStripMenuItem
             // 
             this.runFileDialogToolStripMenuItem.Name = "runFileDialogToolStripMenuItem";
-            this.runFileDialogToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
+            this.runFileDialogToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
             this.runFileDialogToolStripMenuItem.Text = "Run File Dialog";
             this.runFileDialogToolStripMenuItem.Click += new System.EventHandler(this.RunFileDialogToolStripMenuItemClick);
             // 
-            // loadExtensionsToolStripMenuItem
-            // 
-            this.loadExtensionsToolStripMenuItem.Name = "loadExtensionsToolStripMenuItem";
-            this.loadExtensionsToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
-            this.loadExtensionsToolStripMenuItem.Text = "Load Example Extension";
-            this.loadExtensionsToolStripMenuItem.Click += new System.EventHandler(this.LoadExtensionsToolStripMenuItemClick);
-            // 
             // javascriptBindingStressTestToolStripMenuItem
             // 
             this.javascriptBindingStressTestToolStripMenuItem.Name = "javascriptBindingStressTestToolStripMenuItem";
-            this.javascriptBindingStressTestToolStripMenuItem.Size = new System.Drawing.Size(225, 22);
+            this.javascriptBindingStressTestToolStripMenuItem.Size = new System.Drawing.Size(283, 26);
             this.javascriptBindingStressTestToolStripMenuItem.Text = "Javascript Binding Stress Test";
             this.javascriptBindingStressTestToolStripMenuItem.Click += new System.EventHandler(this.JavascriptBindingStressTestToolStripMenuItemClick);
             // 
             // browserTabControl
             // 
             this.browserTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.browserTabControl.Location = new System.Drawing.Point(0, 24);
+            this.browserTabControl.Location = new System.Drawing.Point(0, 28);
+            this.browserTabControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.browserTabControl.Name = "browserTabControl";
             this.browserTabControl.SelectedIndex = 0;
-            this.browserTabControl.Size = new System.Drawing.Size(730, 466);
+            this.browserTabControl.Size = new System.Drawing.Size(973, 575);
             this.browserTabControl.TabIndex = 2;
             // 
-            // takeScreenShotMenuItem
-            // 
-            this.takeScreenShotMenuItem.Name = "takeScreenShotMenuItem";
-            this.takeScreenShotMenuItem.Size = new System.Drawing.Size(207, 22);
-            this.takeScreenShotMenuItem.Text = "Take Screenshot";
-            this.takeScreenShotMenuItem.Click += new System.EventHandler(this.TakeScreenShotMenuItemClick);
-            // 
             // BrowserForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(730, 490);
+            this.ClientSize = new System.Drawing.Size(973, 603);
             this.Controls.Add(this.browserTabControl);
             this.Controls.Add(this.menuStrip1);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "BrowserForm";
             this.Text = "BrowserForm";
             this.menuStrip1.ResumeLayout(false);
@@ -476,7 +469,6 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripMenuItem openDataUrlToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem httpbinorgToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem runFileDialogToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem loadExtensionsToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem javascriptBindingStressTestToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem showDevToolsDockedToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem hideScrollbarsMenuItem;
diff --git a/CefSharp.WinForms.Example/BrowserForm.cs b/CefSharp.WinForms.Example/BrowserForm.cs
index 6e1fae8fac..afb82d6615 100644
--- a/CefSharp.WinForms.Example/BrowserForm.cs
+++ b/CefSharp.WinForms.Example/BrowserForm.cs
@@ -563,65 +563,6 @@ private void RunFileDialogToolStripMenuItemClick(object sender, EventArgs e)
             }
         }
 
-        private void LoadExtensionsToolStripMenuItemClick(object sender, EventArgs e)
-        {
-            var control = GetCurrentTabControl();
-            if (control != null)
-            {
-                //The sample extension only works for http(s) schemes
-                if (control.Browser.GetMainFrame().Url.StartsWith("http"))
-                {
-                    var requestContext = control.Browser.GetRequestContext();
-
-                    const string cefSharpExampleResourcesFolder =
-#if !NETCOREAPP
-                        @"..\..\..\..\CefSharp.Example\Extensions";
-#else
-                        @"..\..\..\..\..\CefSharp.Example\Resources";
-#endif
-
-                    var dir = Path.Combine(AppContext.BaseDirectory, cefSharpExampleResourcesFolder);
-                    dir = Path.GetFullPath(dir);
-                    if (!Directory.Exists(dir))
-                    {
-                        throw new DirectoryNotFoundException("Unable to locate example extensions folder - " + dir);
-                    }
-
-                    var extensionHandler = new ExtensionHandler
-                    {
-                        LoadExtensionPopup = (url) =>
-                        {
-                            BeginInvoke(new Action(() =>
-                            {
-                                var extensionForm = new Form();
-
-                                var extensionBrowser = new ChromiumWebBrowser(url);
-                                //extensionBrowser.IsBrowserInitializedChanged += (s, args) =>
-                                //{
-                                //    extensionBrowser.ShowDevTools();
-                                //};
-
-                                extensionForm.Controls.Add(extensionBrowser);
-
-                                extensionForm.Show(this);
-                            }));
-                        },
-                        GetActiveBrowser = (extension, isIncognito) =>
-                        {
-                            //Return the active browser for which the extension will act upon
-                            return control.Browser.BrowserCore;
-                        }
-                    };
-
-                    requestContext.LoadExtensionsFromDirectory(dir, extensionHandler);
-                }
-                else
-                {
-                    MessageBox.Show("The sample extension only works with http(s) schemes, please load a different website and try again", "Unable to load Extension");
-                }
-            }
-        }
-
         private void JavascriptBindingStressTestToolStripMenuItemClick(object sender, EventArgs e)
         {
             var control = GetCurrentTabControl();
diff --git a/CefSharp.WinForms/CefSettings.cs b/CefSharp.WinForms/CefSettings.cs
index 2f2692ccce..d04b1ebe9e 100644
--- a/CefSharp.WinForms/CefSettings.cs
+++ b/CefSharp.WinForms/CefSettings.cs
@@ -15,8 +15,6 @@ public class CefSettings : CefSettingsBase
         /// </summary>
         public CefSettings() : base()
         {
-            ChromeRuntime = true;
-
             // CEF doesn't call GetAuthCredentials unless
             // the Chrome login prompt is disabled
             // https://github.com/chromiumembedded/cef/issues/3603 
diff --git a/CefSharp.Wpf.Example/MainWindow.xaml b/CefSharp.Wpf.Example/MainWindow.xaml
index 978acd2068..bf607e2286 100644
--- a/CefSharp.Wpf.Example/MainWindow.xaml
+++ b/CefSharp.Wpf.Example/MainWindow.xaml
@@ -55,7 +55,6 @@
                 <MenuItem Header="_Async JSB Task Tests" Command="controls:CefSharpCommands.CustomCommand" CommandParameter="AsyncJsbTaskTests" />
                 <MenuItem Header="_Resize Hack Tests" Command="controls:CefSharpCommands.CustomCommand" CommandParameter="ResizeHackTests" />
                 <MenuItem Header="_Google Service Worker Demo" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="https://googlechrome.github.io/samples/service-worker/basic/"/>
-                <MenuItem Header="Load Example Extension" Command="controls:CefSharpCommands.CustomCommand" CommandParameter="LoadExtension"/>
             </MenuItem>
             <MenuItem Header="_Chrome Urls">
                 <MenuItem Header="_List Internal Urls" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.ChromeInternalUrls}}"/>
diff --git a/CefSharp.Wpf.Example/MainWindow.xaml.cs b/CefSharp.Wpf.Example/MainWindow.xaml.cs
index 0633b7d550..a7aa033219 100644
--- a/CefSharp.Wpf.Example/MainWindow.xaml.cs
+++ b/CefSharp.Wpf.Example/MainWindow.xaml.cs
@@ -149,54 +149,6 @@ private void CustomCommandBinding(object sender, ExecutedRoutedEventArgs e)
                         });
                     }
                 }
-                else if (param == "LoadExtension")
-                {
-                    var browser = browserViewModel.WebBrowser;
-                    //The sample extension only works for http(s) schemes
-                    if (browser.Address.StartsWith("http"))
-                    {
-                        var requestContext = browser.GetBrowserHost().RequestContext;
-
-                        var dir = Path.Combine(AppContext.BaseDirectory, @"..\..\..\..\CefSharp.Example\Extensions");
-                        dir = Path.GetFullPath(dir);
-                        if (!Directory.Exists(dir))
-                        {
-                            throw new DirectoryNotFoundException("Unable to locate example extensions folder - " + dir);
-                        }
-
-                        var extensionHandler = new ExtensionHandler
-                        {
-                            LoadExtensionPopup = (url) =>
-                            {
-                                Dispatcher.BeginInvoke(new Action(() =>
-                                {
-                                    var extensionWindow = new Window();
-
-                                    var extensionBrowser = new ChromiumWebBrowser(url);
-                                    //extensionBrowser.IsBrowserInitializedChanged += (s, args) =>
-                                    //{
-                                    //    extensionBrowser.ShowDevTools();
-                                    //};
-
-                                    extensionWindow.Content = extensionBrowser;
-
-                                    extensionWindow.Show();
-                                }));
-                            },
-                            GetActiveBrowser = (extension, isIncognito) =>
-                            {
-                                //Return the active browser for which the extension will act upon
-                                return browser.BrowserCore;
-                            }
-                        };
-
-                        requestContext.LoadExtensionsFromDirectory(dir, extensionHandler);
-                    }
-                    else
-                    {
-                        MessageBox.Show("The sample extension only works with http(s) schemes, please load a different website and try again", "Unable to load Extension");
-                    }
-                }
                 else if (param == "ToggleSidebar")
                 {
                     browserViewModel.ShowSidebar = !browserViewModel.ShowSidebar;
diff --git a/CefSharp.Wpf/CefSettings.cs b/CefSharp.Wpf/CefSettings.cs
index 42021e09e1..ac0eb9809e 100644
--- a/CefSharp.Wpf/CefSettings.cs
+++ b/CefSharp.Wpf/CefSettings.cs
@@ -16,7 +16,6 @@ public class CefSettings : CefSettingsBase
         public CefSettings() : base()
         {
             WindowlessRenderingEnabled = true;
-            ChromeRuntime = true;
 
             //Disable multithreaded, compositor scrolling of web content
             //With OSR rendering it's fairly common for this to improve scrolling performace
diff --git a/CefSharp/Callback/IGetExtensionResourceCallback.cs b/CefSharp/Callback/IGetExtensionResourceCallback.cs
deleted file mode 100644
index 23ea1d8579..0000000000
--- a/CefSharp/Callback/IGetExtensionResourceCallback.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-using System;
-using System.IO;
-
-namespace CefSharp
-{
-    /// <summary>
-    /// Callback interface used for asynchronous continuation of <see cref="IExtensionHandler.GetExtensionResource"/>.
-    /// </summary>
-    public interface IGetExtensionResourceCallback : IDisposable
-    {
-        /// <summary>
-        /// Continue the request. Read the resource contents from stream.
-        /// </summary>
-        /// <param name="stream">stream to be used as response.</param>
-        void Continue(Stream stream);
-
-        /// <summary>
-        /// Continue the request
-        /// </summary>
-        /// <param name="data">data to be used as response</param>
-        void Continue(byte[] data);
-
-        /// <summary>
-        /// Cancel the request.
-        /// </summary>
-        void Cancel();
-    }
-}
diff --git a/CefSharp/DependencyChecker.cs b/CefSharp/DependencyChecker.cs
index 25e8c09d89..148b4d3cb6 100644
--- a/CefSharp/DependencyChecker.cs
+++ b/CefSharp/DependencyChecker.cs
@@ -132,11 +132,7 @@ public static List<string> CheckDependencies(bool checkOptional, bool packLoadin
             var missingDependencies = new List<string>();
 
             missingDependencies.AddRange(CheckDependencyList(nativeLibPath, CefDependencies));
-
-            if (!packLoadingDisabled)
-            {
-                missingDependencies.AddRange(CheckDependencyList(resourcesDirPath, CefResources));
-            }
+            missingDependencies.AddRange(CheckDependencyList(resourcesDirPath, CefResources));
 
             if (checkOptional)
             {
diff --git a/CefSharp/Enums/CefRuntimeStyle.cs b/CefSharp/Enums/CefRuntimeStyle.cs
index a09119a9cf..50f2c67535 100644
--- a/CefSharp/Enums/CefRuntimeStyle.cs
+++ b/CefSharp/Enums/CefRuntimeStyle.cs
@@ -9,9 +9,8 @@ namespace CefSharp
     /// additional comparative details on runtime types see
     /// https://bitbucket.org/chromiumembedded/cef/wiki/Architecture.md#markdown-header-cef3
     ///
-    /// Each runtime is composed of a bootstrap component and a style component. The
-    /// bootstrap component is configured via CefSettings.ChromeRuntime and cannot
-    /// be changed after CefInitialize. The style component is individually
+    /// Each runtime is composed of a bootstrap component and a style component.
+    /// The style component is individually
     /// configured for each window/browser at creation time and, in combination with
     /// the Chrome bootstrap, different styles can be mixed during runtime.
     ///
@@ -29,19 +28,18 @@ namespace CefSharp
     public enum CefRuntimeStyle
     {
         /// <summary>
-        /// Use the default runtime style. The default style will match the
-        /// CefSettings.ChromeRuntime value in most cases. See above documentation
+        /// Use the default runtime style. See above documentation
         /// for exceptions.
         /// </summary>
         Default,
 
         /// <summary>
-        /// Use the Chrome runtime style. Only supported with the Chrome runtime.
+        /// Use the Chrome runtime style.
         /// </summary>
         Chrome,
 
         /// <summary>
-        /// Use the Alloy runtime style. Supported with both the Alloy and Chrome
+        /// Use the Alloy runtime style.
         /// runtime.
         /// </summary>
         Alloy,
diff --git a/CefSharp/Handler/ExtensionHandler .cs b/CefSharp/Handler/ExtensionHandler .cs
deleted file mode 100644
index 04f62a4ddf..0000000000
--- a/CefSharp/Handler/ExtensionHandler .cs	
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright © 2021 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-using System;
-
-namespace CefSharp.Handler
-{
-    /// <summary>
-    /// Implement this interface to handle events related to browser extensions.
-    /// The methods of this class will be called on the CEF UI thread.
-    /// See <see cref="IRequestContext.LoadExtension"/> for information about extension loading.
-    /// </summary>
-    public class ExtensionHandler : IExtensionHandler
-    {
-        private bool isDisposed;
-
-        /// <summary>
-        /// Called if the <see cref="IRequestContext.LoadExtension"/> request fails.
-        /// </summary>
-        /// <param name="errorCode">error code</param>
-        void IExtensionHandler.OnExtensionLoadFailed(CefErrorCode errorCode)
-        {
-            OnExtensionLoadFailed(errorCode);
-        }
-
-        /// <summary>
-        /// Called if the <see cref="IRequestContext.LoadExtension"/> request fails.
-        /// </summary>
-        /// <param name="errorCode">error code</param>
-        protected virtual void OnExtensionLoadFailed(CefErrorCode errorCode)
-        {
-
-        }
-
-        /// <summary>
-        /// Called if the <see cref="IRequestContext.LoadExtension"/> request succeeds.
-        /// </summary>
-        /// <param name="extension">is the loaded extension.</param>
-        void IExtensionHandler.OnExtensionLoaded(IExtension extension)
-        {
-            OnExtensionLoaded(extension);
-        }
-
-        /// <summary>
-        /// Called if the <see cref="IRequestContext.LoadExtension"/> request succeeds.
-        /// </summary>
-        /// <param name="extension">is the loaded extension.</param>
-        protected virtual void OnExtensionLoaded(IExtension extension)
-        {
-
-        }
-
-        /// <summary>
-        /// Called after the IExtension.Unload request has completed.
-        /// </summary>
-        /// <param name="extension">is the unloaded extension</param>
-        void IExtensionHandler.OnExtensionUnloaded(IExtension extension)
-        {
-            OnExtensionUnloaded(extension);
-        }
-
-        /// <summary>
-        /// Called after the IExtension.Unload request has completed.
-        /// </summary>
-        /// <param name="extension">is the unloaded extension</param>
-        protected virtual void OnExtensionUnloaded(IExtension extension)
-        {
-
-        }
-
-        /// <summary>
-        /// Called when an extension needs a browser to host a background script specified via the "background" manifest key.
-        /// The browser will have no visible window and cannot be displayed. To allow creation of the browser optionally
-        /// modify newBrowser and settings and return false. To cancel creation of the browser
-        /// (and consequently cancel load of the background script) return  true. Successful creation will be indicated by a call to
-        /// ILifeSpanHandler.OnAfterCreated, and IBrowserHost.IsBackgroundHost
-        /// will return true for the resulting browser. See https://developer.chrome.com/extensions/event_pages for more information
-        /// about extension background script usage.
-        /// </summary>
-        /// <param name="extension">is the extension that is loading the background script</param>
-        /// <param name="url">is an internally generated reference to an HTML page that will be used to
-        /// load the background script via a script src attribute</param>
-        /// <param name="settings">browser settings</param>
-        /// <returns>To cancel creation of the browser (and consequently cancel load of the background script) return true, otherwise return false.</returns>
-        bool IExtensionHandler.OnBeforeBackgroundBrowser(IExtension extension, string url, IBrowserSettings settings)
-        {
-            return OnBeforeBackgroundBrowser(extension, url, settings);
-        }
-
-        /// <summary>
-        /// Called when an extension needs a browser to host a background script specified via the "background" manifest key.
-        /// The browser will have no visible window and cannot be displayed. To allow creation of the browser optionally
-        /// modify newBrowser and settings and return false. To cancel creation of the browser
-        /// (and consequently cancel load of the background script) return  true. Successful creation will be indicated by a call to
-        /// ILifeSpanHandler.OnAfterCreated, and IBrowserHost.IsBackgroundHost
-        /// will return true for the resulting browser. See https://developer.chrome.com/extensions/event_pages for more information
-        /// about extension background script usage.
-        /// </summary>
-        /// <param name="extension">is the extension that is loading the background script</param>
-        /// <param name="url">is an internally generated reference to an HTML page that will be used to
-        /// load the background script via a script src attribute</param>
-        /// <param name="settings">browser settings</param>
-        /// <returns>To cancel creation of the browser (and consequently cancel load of the background script) return true, otherwise return false.</returns>
-        protected virtual bool OnBeforeBackgroundBrowser(IExtension extension, string url, IBrowserSettings settings)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// Called when an extension API (e.g. chrome.tabs.create) requests creation of a new browser.
-        /// Successful creation will be indicated by a call to <see cref="ILifeSpanHandler.OnAfterCreated"/>.
-        /// </summary>
-        /// <param name="extension">the source of the API call</param>
-        /// <param name="browser">the source of the API call</param>
-        /// <param name="activeBrowser">may optionally be specified via the windowId property or
-        /// returned via the GetActiveBrowser() callback and provides the default for the new browser</param>
-        /// <param name="index">is the position value optionally specified via the index property</param>
-        /// <param name="url">is the URL that will be loaded in the browser</param>
-        /// <param name="active">is true if the new browser should be active when opened</param>
-        /// <param name="windowInfo">optionally modify if you are going to allow creation of the browser</param>
-        /// <param name="settings">optionally modify browser settings</param>
-        /// <returns>To cancel creation of the browser return true. To allow creation return false and optionally modify windowInfo and settings</returns>
-        bool IExtensionHandler.OnBeforeBrowser(IExtension extension, IBrowser browser, IBrowser activeBrowser, int index, string url, bool active, IWindowInfo windowInfo, IBrowserSettings settings)
-        {
-            return OnBeforeBrowser(extension, browser, activeBrowser, index, url, active, windowInfo, settings);
-        }
-
-        /// <summary>
-        /// Called when an extension API (e.g. chrome.tabs.create) requests creation of a new browser.
-        /// Successful creation will be indicated by a call to <see cref="ILifeSpanHandler.OnAfterCreated"/>.
-        /// </summary>
-        /// <param name="extension">the source of the API call</param>
-        /// <param name="browser">the source of the API call</param>
-        /// <param name="activeBrowser">may optionally be specified via the windowId property or
-        /// returned via the GetActiveBrowser() callback and provides the default for the new browser</param>
-        /// <param name="index">is the position value optionally specified via the index property</param>
-        /// <param name="url">is the URL that will be loaded in the browser</param>
-        /// <param name="active">is true if the new browser should be active when opened</param>
-        /// <param name="windowInfo">optionally modify if you are going to allow creation of the browser</param>
-        /// <param name="settings">optionally modify browser settings</param>
-        /// <returns>To cancel creation of the browser return true. To allow creation return false and optionally modify windowInfo and settings</returns>
-        protected virtual bool OnBeforeBrowser(IExtension extension, IBrowser browser, IBrowser activeBrowser, int index, string url, bool active, IWindowInfo windowInfo, IBrowserSettings settings)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// Called when no tabId is specified to an extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="includeIncognito">Incognito browsers should not be considered unless the source extension has incognito
-        /// access enabled, inwhich case this will be true</param>
-        /// <returns>Return the browser that will be acted on by the API call or return null to act on <paramref name="browser"/>.
-        /// The returned browser must share the same IRequestContext as <paramref name="browser"/></returns>
-        IBrowser IExtensionHandler.GetActiveBrowser(IExtension extension, IBrowser browser, bool includeIncognito)
-        {
-            return GetActiveBrowser(extension, browser, includeIncognito);
-        }
-
-        /// <summary>
-        /// Called when no tabId is specified to an extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="includeIncognito">Incognito browsers should not be considered unless the source extension has incognito
-        /// access enabled, inwhich case this will be true</param>
-        /// <returns>Return the browser that will be acted on by the API call or return null to act on <paramref name="browser"/>.
-        /// The returned browser must share the same IRequestContext as <paramref name="browser"/></returns>
-        protected virtual IBrowser GetActiveBrowser(IExtension extension, IBrowser browser, bool includeIncognito)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// Called when the tabId associated with <paramref name="targetBrowser"/> is specified to an extension API call that accepts a tabId
-        /// parameter (e.g. chrome.tabs.*).
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="includeIncognito">Access to incognito browsers should not be allowed unless the source extension has
-        /// incognito access
-        /// enabled, in which case this will be true.</param>
-        /// <param name="targetBrowser"></param>
-        /// <returns>Return true to allow access of false to deny access.</returns>
-        bool IExtensionHandler.CanAccessBrowser(IExtension extension, IBrowser browser, bool includeIncognito, IBrowser targetBrowser)
-        {
-            return CanAccessBrowser(extension, browser, includeIncognito, targetBrowser);
-        }
-
-        /// <summary>
-        /// Called when the tabId associated with <paramref name="targetBrowser"/> is specified to an extension API call that accepts a tabId
-        /// parameter (e.g. chrome.tabs.*).
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="includeIncognito">Access to incognito browsers should not be allowed unless the source extension has
-        /// incognito access
-        /// enabled, in which case this will be true.</param>
-        /// <param name="targetBrowser"></param>
-        /// <returns>Return true to allow access of false to deny access.</returns>
-        protected virtual bool CanAccessBrowser(IExtension extension, IBrowser browser, bool includeIncognito, IBrowser targetBrowser)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// Called to retrieve an extension resource that would normally be loaded from disk
-        /// (e.g. if a file parameter is specified to chrome.tabs.executeScript).
-        /// Localization substitutions will not be applied to resources handled via this method.
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="file">is the requested relative file path.</param>
-        /// <param name="callback">callback used to handle custom resource requests</param>
-        /// <returns>To handle the resource request return true and execute <paramref name="callback"/> either synchronously or asynchronously.
-        /// For the default behavior which reads the resource from the extension directory on disk return false</returns>
-        bool IExtensionHandler.GetExtensionResource(IExtension extension, IBrowser browser, string file, IGetExtensionResourceCallback callback)
-        {
-            return GetExtensionResource(extension, browser, file, callback);
-        }
-
-        /// <summary>
-        /// Called to retrieve an extension resource that would normally be loaded from disk
-        /// (e.g. if a file parameter is specified to chrome.tabs.executeScript).
-        /// Localization substitutions will not be applied to resources handled via this method.
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="file">is the requested relative file path.</param>
-        /// <param name="callback">callback used to handle custom resource requests</param>
-        /// <returns>To handle the resource request return true and execute <paramref name="callback"/> either synchronously or asynchronously.
-        /// For the default behavior which reads the resource from the extension directory on disk return false</returns>
-        protected virtual bool GetExtensionResource(IExtension extension, IBrowser browser, string file, IGetExtensionResourceCallback callback)
-        {
-            return false;
-        }
-
-        /// <summary>
-        /// IsDisposed
-        /// </summary>
-        public bool IsDisposed
-        {
-            get { return isDisposed; }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            isDisposed = true;
-        }
-
-        /// <inheritdoc/>
-        void IDisposable.Dispose()
-        {
-            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-    }
-}
diff --git a/CefSharp/Handler/IExtensionHandler.cs b/CefSharp/Handler/IExtensionHandler.cs
deleted file mode 100644
index 4822b206c9..0000000000
--- a/CefSharp/Handler/IExtensionHandler.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-using System;
-
-namespace CefSharp
-{
-    /// <summary>
-    /// Implement this interface to handle events related to browser extensions.
-    /// The methods of this class will be called on the CEF UI thread.
-    /// See <see cref="IRequestContext.LoadExtension"/> for information about extension loading.
-    /// </summary>
-    public interface IExtensionHandler : IDisposable
-    {
-        /// <summary>
-        /// Called if the <see cref="IRequestContext.LoadExtension"/> request fails.
-        /// </summary>
-        /// <param name="errorCode">error code</param>
-        void OnExtensionLoadFailed(CefErrorCode errorCode);
-
-        /// <summary>
-        /// Called if the <see cref="IRequestContext.LoadExtension"/> request succeeds.
-        /// </summary>
-        /// <param name="extension">is the loaded extension.</param>
-        void OnExtensionLoaded(IExtension extension);
-
-        /// <summary>
-        /// Called after the IExtension.Unload request has completed.
-        /// </summary>
-        /// <param name="extension">is the unloaded extension</param>
-        void OnExtensionUnloaded(IExtension extension);
-
-        /// <summary>
-        /// Called when an extension needs a browser to host a background script specified via the "background" manifest key.
-        /// The browser will have no visible window and cannot be displayed. To allow creation of the browser optionally
-        /// modify newBrowser and settings and return false. To cancel creation of the browser
-        /// (and consequently cancel load of the background script) return  true. Successful creation will be indicated by a call to
-        /// ILifeSpanHandler.OnAfterCreated, and IBrowserHost.IsBackgroundHost
-        /// will return true for the resulting browser. See https://developer.chrome.com/extensions/event_pages for more information
-        /// about extension background script usage.
-        /// </summary>
-        /// <param name="extension">is the extension that is loading the background script</param>
-        /// <param name="url">is an internally generated reference to an HTML page that will be used to
-        /// load the background script via a script src attribute</param>
-        /// <param name="settings">browser settings</param>
-        /// <returns>To cancel creation of the browser (and consequently cancel load of the background script) return true, otherwise return false.</returns>
-        bool OnBeforeBackgroundBrowser(IExtension extension, string url, IBrowserSettings settings);
-
-        /// <summary>
-        /// Called when an extension API (e.g. chrome.tabs.create) requests creation of a new browser.
-        /// Successful creation will be indicated by a call to <see cref="ILifeSpanHandler.OnAfterCreated"/>.
-        /// </summary>
-        /// <param name="extension">the source of the API call</param>
-        /// <param name="browser">the source of the API call</param>
-        /// <param name="activeBrowser">may optionally be specified via the windowId property or
-        /// returned via the GetActiveBrowser() callback and provides the default for the new browser</param>
-        /// <param name="index">is the position value optionally specified via the index property</param>
-        /// <param name="url">is the URL that will be loaded in the browser</param>
-        /// <param name="active">is true if the new browser should be active when opened</param>
-        /// <param name="windowInfo">optionally modify if you are going to allow creation of the browser</param>
-        /// <param name="settings">optionally modify browser settings</param>
-        /// <returns>To cancel creation of the browser return true. To allow creation return false and optionally modify windowInfo and settings</returns>
-        bool OnBeforeBrowser(IExtension extension, IBrowser browser, IBrowser activeBrowser, int index, string url, bool active, IWindowInfo windowInfo, IBrowserSettings settings);
-
-        /// <summary>
-        /// Called when no tabId is specified to an extension API call that accepts a tabId parameter (e.g. chrome.tabs.*).
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="includeIncognito">Incognito browsers should not be considered unless the source extension has incognito
-        /// access enabled, inwhich case this will be true</param>
-        /// <returns>Return the browser that will be acted on by the API call or return null to act on <paramref name="browser"/>.
-        /// The returned browser must share the same IRequestContext as <paramref name="browser"/></returns>
-        IBrowser GetActiveBrowser(IExtension extension, IBrowser browser, bool includeIncognito);
-
-        /// <summary>
-        /// Called when the tabId associated with <paramref name="targetBrowser"/> is specified to an extension API call that accepts a tabId
-        /// parameter (e.g. chrome.tabs.*).
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="includeIncognito">Access to incognito browsers should not be allowed unless the source extension has
-        /// incognito access
-        /// enabled, in which case this will be true.</param>
-        /// <param name="targetBrowser"></param>
-        /// <returns>Return true to allow access of false to deny access.</returns>
-        bool CanAccessBrowser(IExtension extension, IBrowser browser, bool includeIncognito, IBrowser targetBrowser);
-
-        /// <summary>
-        /// Called to retrieve an extension resource that would normally be loaded from disk
-        /// (e.g. if a file parameter is specified to chrome.tabs.executeScript).
-        /// Localization substitutions will not be applied to resources handled via this method.
-        /// </summary>
-        /// <param name="extension">extension the call originates from</param>
-        /// <param name="browser">browser the call originates from</param>
-        /// <param name="file">is the requested relative file path.</param>
-        /// <param name="callback">callback used to handle custom resource requests</param>
-        /// <returns>To handle the resource request return true and execute <paramref name="callback"/> either synchronously or asynchronously.
-        /// For the default behavior which reads the resource from the extension directory on disk return false</returns>
-        bool GetExtensionResource(IExtension extension, IBrowser browser, string file, IGetExtensionResourceCallback callback);
-    }
-}
diff --git a/CefSharp/IBrowserHost.cs b/CefSharp/IBrowserHost.cs
index 5da5680816..51d1032770 100644
--- a/CefSharp/IBrowserHost.cs
+++ b/CefSharp/IBrowserHost.cs
@@ -196,11 +196,6 @@ public interface IBrowserHost : IDisposable
         /// <remarks>The <see cref="IFindHandler"/> instance, if any, will be called to report find results.</remarks>
         void Find(string searchText, bool forward, bool matchCase, bool findNext);
 
-        /// <summary>
-        /// Returns the extension hosted in this browser or null if no extension is hosted. See <see cref="IRequestContext.LoadExtension"/> for details.
-        /// </summary>
-        IExtension Extension { get; }
-
         /// <summary>
         /// Retrieve the window handle of the browser that opened this browser.
         /// </summary>
@@ -233,13 +228,6 @@ public interface IBrowserHost : IDisposable
         /// <param name="type">indicates which surface to re-paint either View or Popup.</param>
         void Invalidate(PaintElementType type);
 
-        /// <summary>
-        /// Returns true if this browser is hosting an extension background script. Background hosts do not have a window and are not displayable.
-        /// See <see cref="IRequestContext.LoadExtension"/> for details.
-        /// </summary>
-        /// <returns>Returns true if this browser is hosting an extension background script.</returns>
-        bool IsBackgroundHost { get; }
-
         /// <summary>
         /// Begins a new composition or updates the existing composition. Blink has a
         /// special node (a composition node) that allows the input method to change
diff --git a/CefSharp/IExtension.cs b/CefSharp/IExtension.cs
deleted file mode 100644
index 32e866bf41..0000000000
--- a/CefSharp/IExtension.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright © 2018 The CefSharp Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-using System.Collections.Generic;
-
-namespace CefSharp
-{
-    /// <summary>
-    /// Object representing an extension. Methods may be called on any thread unless otherwise indicated.
-    /// </summary>
-    public interface IExtension
-    {
-        /// <summary>
-        /// Returns the unique extension identifier. This is calculated based on the
-        /// extension public key, if available, or on the extension path. See
-        /// https://developer.chrome.com/extensions/manifest/key for details.
-        /// </summary>
-        string Identifier { get; }
-
-        /// <summary>
-        /// Returns the absolute path to the extension directory on disk. This value
-        /// will be prefixed with PK_DIR_RESOURCES if a relative path was passed to
-        /// IRequestContext.LoadExtension.
-        /// </summary>
-        string Path { get; }
-
-        /// <summary>
-        /// Returns the extension manifest contents as a CefDictionaryValue object. See
-        /// https://developer.chrome.com/extensions/manifest for details.
-        /// </summary>
-        IDictionary<string, IValue> Manifest { get; }
-
-        /// <summary>
-        /// Returns true if this object is the same extension as that object.
-        /// Extensions are considered the same if identifier, path and loader context
-        /// match.
-        /// </summary>
-        /// <param name="that">extension to compare</param>
-        /// <returns>return true if the same extension</returns>
-        bool IsSame(IExtension that);
-
-        /// <summary>
-        /// Returns the request context that loaded this extension. Will return NULL
-        /// for internal extensions or if the extension has been unloaded. See the
-        /// CefRequestContext::LoadExtension documentation for more information about
-        /// loader contexts. Must be called on the CEF UI thread.
-        /// </summary>
-        IRequestContext LoaderContext { get; }
-
-        /// <summary>
-        /// Returns true if this extension is currently loaded. Must be called on the
-        /// CEF UI thread.
-        /// </summary>
-        bool IsLoaded { get; }
-
-        /// <summary>
-        /// Unload this extension if it is not an internal extension and is currently
-        /// loaded. Will result in a call to IExtensionHandler.OnExtensionUnloaded
-        /// on success.
-        /// </summary>
-        void Unload();
-    }
-}
diff --git a/CefSharp/IRequestContext.cs b/CefSharp/IRequestContext.cs
index 300096f0f6..f41238c504 100644
--- a/CefSharp/IRequestContext.cs
+++ b/CefSharp/IRequestContext.cs
@@ -191,85 +191,6 @@ public interface IRequestContext : IDisposable
         /// <returns>A task that represents the Resoolve Host operation. The value of the TResult parameter contains ResolveCallbackResult.</returns>
         Task<ResolveCallbackResult> ResolveHostAsync(Uri origin);
 
-        /// <summary>
-        /// Returns true if this context was used to load the extension identified by extensionId. Other contexts sharing the same storage will also have access to the extension (see HasExtension).
-        /// This method must be called on the CEF UI thread.
-        /// </summary>
-        /// <returns>Returns true if this context was used to load the extension identified by extensionId</returns>
-        bool DidLoadExtension(string extensionId);
-
-        /// <summary>
-        /// Returns the extension matching extensionId or null if no matching extension is accessible in this context (see HasExtension).
-        /// This method must be called on the CEF UI thread.
-        /// </summary>
-        /// <param name="extensionId">extension Id</param>
-        /// <returns>Returns the extension matching extensionId or null if no matching extension is accessible in this context</returns>
-        IExtension GetExtension(string extensionId);
-
-        /// <summary>
-        /// Retrieve the list of all extensions that this context has access to (see HasExtension).
-        /// <paramref name="extensionIds"/> will be populated with the list of extension ID values.
-        /// This method must be called on the CEF UI thread.
-        /// </summary>
-        /// <param name="extensionIds">output a list of extensions Ids</param>
-        /// <returns>returns true on success otherwise false</returns>
-        bool GetExtensions(out IList<string> extensionIds);
-
-        /// <summary>
-        /// Returns true if this context has access to the extension identified by extensionId.
-        /// This may not be the context that was used to load the extension (see DidLoadExtension).
-        /// This method must be called on the CEF UI thread.
-        /// </summary>
-        /// <param name="extensionId">extension id</param>
-        /// <returns>Returns true if this context has access to the extension identified by extensionId</returns>
-        bool HasExtension(string extensionId);
-
-        /// <summary>
-        /// Load an extension. If extension resources will be read from disk using the default load implementation then rootDirectoy
-        /// should be the absolute path to the extension resources directory and manifestJson should be null.
-        /// If extension resources will be provided by the client (e.g. via IRequestHandler and/or IExtensionHandler) then rootDirectory
-        /// should be a path component unique to the extension (if not absolute this will be internally prefixed with the PK_DIR_RESOURCES path)
-        /// and manifestJson should contain the contents that would otherwise be read from the "manifest.json" file on disk.
-        /// The loaded extension will be accessible in all contexts sharing the same storage (HasExtension returns true).
-        /// However, only the context on which this method was called is considered the loader (DidLoadExtension returns true) and only the
-        /// loader will receive IRequestContextHandler callbacks for the extension.
-        ///
-        /// <see cref="IExtensionHandler.OnExtensionLoaded"/> will be called on load success or
-        /// <see cref="IExtensionHandler.OnExtensionLoadFailed"/> will be called on load failure.
-        /// 
-        /// If the extension specifies a background script via the "background" manifest key then <see cref="IExtensionHandler.OnBeforeBackgroundBrowser"/>
-        /// will be called to create the background browser. See that method for additional information about background scripts.
-        /// 
-        /// For visible extension views the client application should evaluate the manifest to determine the correct extension URL to load and then
-        /// load the extension URL in a ChromiumWebBrowser instance after the extension has loaded.
-        ///
-        /// For example, the client can look for the "browser_action" manifest key as documented at https://developer.chrome.com/extensions/browserAction.
-        /// Extension URLs take the form "chrome-extension://&lt;extension_id&gt;/&lt;path&gt;"
-        /// Browsers that host extensions differ from normal browsers as follows:
-        /// 
-        /// - Can access chrome.* JavaScript APIs if allowed by the manifest. Visit chrome://extensions-support for the list of extension APIs currently supported by CEF.
-        /// - Main frame navigation to non-extension content is blocked.
-        /// - Pinch-zooming is disabled.
-        /// - <see cref="IBrowserHost.Extension"/> returns the hosted extension.
-        /// - CefBrowserHost::IsBackgroundHost returns true for background hosts.
-        ///
-        /// See https://developer.chrome.com/extensions for extension implementation and usage documentation.
-        /// </summary>
-        /// <param name="rootDirectory">If extension resources will be read from disk using the default load implementation then rootDirectoy
-        /// should be the absolute path to the extension resources directory and manifestJson should be null</param>
-        /// <param name="manifestJson">If extension resources will be provided by the client then rootDirectory should be a path component unique to the extension
-        /// and manifestJson should contain the contents that would otherwise be read from the manifest.json file on disk</param>
-        /// <param name="handler">handle events related to browser extensions</param>
-        /// <remarks>
-        /// For extensions that load a popup you are required to query the Manifest, build a Url in the format
-        /// chrome-extension://{extension.Identifier}/{default_popup} with default_popup url coming from the mainfest. With the extension
-        /// url you then need to open a new Form/Window/Tab and create a new ChromiumWebBrowser instance to host the extension popup.
-        /// To load a crx file you must first unzip them to a folder and pass the path containing the extension as <paramref name="rootDirectory"/>.
-        /// It in theory should be possible to load a crx file in memory, passing it's manifest.json file content as <paramref name="manifestJson"/>
-        /// then fulfilling the resource rquests made to <see cref="IExtensionHandler.GetExtensionResource(IExtension, IBrowser, string, IGetExtensionResourceCallback)"/>.
-        /// </remarks>
-        void LoadExtension(string rootDirectory, string manifestJson, IExtensionHandler handler);
-
         /// <summary>
         /// Used internally to get the underlying <see cref="IRequestContext"/> instance.
         /// Unlikely you'll use this yourself.
diff --git a/CefSharp/RequestContextExtensions.cs b/CefSharp/RequestContextExtensions.cs
index b3f3cef55a..898f8f84d9 100644
--- a/CefSharp/RequestContextExtensions.cs
+++ b/CefSharp/RequestContextExtensions.cs
@@ -24,41 +24,6 @@ public static class RequestContextExtensions
         /// </summary>
         private static string[] ProxySchemes = new string[] { "http", "socks", "socks4", "socks5" };
 
-        /// <summary>
-        /// Load an extension from the given directory. To load a crx file you must unzip it first.
-        /// For further details see <seealso cref="IRequestContext.LoadExtension(string, string, IExtensionHandler)"/>
-        /// </summary>
-        /// <param name="requestContext">request context</param>
-        /// <param name="rootDirectory">absolute path to the directory that contains the extension to be loaded.</param>
-        /// <param name="handler">handle events related to browser extensions</param>
-        public static void LoadExtensionFromDirectory(this IRequestContext requestContext, string rootDirectory, IExtensionHandler handler)
-        {
-            requestContext.LoadExtension(Path.GetFullPath(rootDirectory), null, handler);
-        }
-
-        /// <summary>
-        /// Load extension(s) from the given directory. This methods obtains all the sub directories of <paramref name="rootDirectory"/>
-        /// and calls <see cref="IRequestContext.LoadExtension(string, string, IExtensionHandler)"/> if manifest.json
-        /// is found in the sub folder. To load crx file(s) you must unzip them first.
-        /// For further details see <seealso cref="IRequestContext.LoadExtension(string, string, IExtensionHandler)"/>
-        /// </summary>
-        /// <param name="requestContext">request context</param>
-        /// <param name="rootDirectory">absolute path to the directory that contains the extension(s) to be loaded.</param>
-        /// <param name="handler">handle events related to browser extensions</param>
-        public static void LoadExtensionsFromDirectory(this IRequestContext requestContext, string rootDirectory, IExtensionHandler handler)
-        {
-            var fullPath = Path.GetFullPath(rootDirectory);
-
-            foreach (var dir in Directory.GetDirectories(fullPath))
-            {
-                //Check the directory has a manifest.json, if so call load
-                if (File.Exists(Path.Combine(dir, "manifest.json")))
-                {
-                    requestContext.LoadExtension(dir, null, handler);
-                }
-            }
-        }
-
         /// <summary>
         /// Gets the cookie manager associated with the <see cref="IRequestContext"/>. Once the cookie manager
         /// storage has been initialized the method will return.