diff --git a/CefSharp.Core.Runtime/Cef.h b/CefSharp.Core.Runtime/Cef.h index 0301d2acf..13f4f4123 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 55db47922..98128b200 100644 --- a/CefSharp.Core.Runtime/CefSettingsBase.h +++ b/CefSharp.Core.Runtime/CefSettingsBase.h @@ -84,18 +84,6 @@ namespace CefSharp CommandLineArgDictionary^ get() { return _cefCommandLineArgs; } } - /// - /// **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 - /// - property bool ChromeRuntime - { - bool get() { return _cefSettings->chrome_runtime == 1; } - void set(bool value) { _cefSettings->chrome_runtime = value; } - } - /// /// 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); } } - /// - /// 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. - /// - property bool PackLoadingDisabled - { - bool get() { return _cefSettings->pack_loading_disabled == 1; } - void set(bool value) { _cefSettings->pack_loading_disabled = value; } - } - /// /// 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; } } - /// - /// 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. - /// - property bool PersistUserPreferences - { - bool get() { return _cefSettings->persist_user_preferences == 1; } - void set(bool value) { _cefSettings->persist_user_preferences = value; } - } - /// /// 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 dd33e6865..0a1fab68d 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj @@ -239,7 +239,6 @@ - @@ -277,8 +276,6 @@ - - diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters index 5f6a9aec4..11ece6552 100644 --- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters +++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters @@ -62,9 +62,6 @@ Source Files - - Source Files - Source Files @@ -259,12 +256,6 @@ Header Files - - Header Files - - - Header Files - Header Files diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp index 7068fe988..5b8da2a87 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^ 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^ underlines, Nullable replacementRange, Nullable selectionRange) { ThrowIfDisposed(); diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h index 2f2cd093b..ca6bb5f5c 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^ 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^ underlines, Nullable replacementRange, Nullable selectionRange); virtual void ImeCommitText(String^ text, Nullable 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 14fa5278d..000000000 --- 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 _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 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 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