Skip to content

Commit 19739ab

Browse files
committed
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
1 parent 77f5e6d commit 19739ab

34 files changed

+63
-1558
lines changed

CefSharp.Core.Runtime/Cef.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,9 @@ namespace CefSharp
286286
PathCheck::AssertAbsolute(cefSettings->LocalesDirPath, "CefSettings.LocalesDirPath");
287287
PathCheck::AssertAbsolute(cefSettings->BrowserSubprocessPath, "CefSettings.BrowserSubprocessPath");
288288

289-
290289
if (performDependencyCheck)
291290
{
292-
DependencyChecker::AssertAllDependenciesPresent(cefSettings->Locale, cefSettings->LocalesDirPath, cefSettings->ResourcesDirPath, cefSettings->PackLoadingDisabled, cefSettings->BrowserSubprocessPath);
291+
DependencyChecker::AssertAllDependenciesPresent(cefSettings->Locale, cefSettings->LocalesDirPath, cefSettings->ResourcesDirPath, false, cefSettings->BrowserSubprocessPath);
293292
}
294293
else if (!File::Exists(cefSettings->BrowserSubprocessPath))
295294
{

CefSharp.Core.Runtime/CefSettingsBase.h

-34
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,6 @@ namespace CefSharp
8484
CommandLineArgDictionary^ get() { return _cefCommandLineArgs; }
8585
}
8686

87-
/// <summary>
88-
/// **Experimental**
89-
/// Set to true to enable use of the Chrome runtime in CEF. This feature is
90-
/// considered experimental and is not recommended for most users at this time.
91-
/// See issue https://github.com/chromiumembedded/cef/issues/2969
92-
/// </summary>
93-
property bool ChromeRuntime
94-
{
95-
bool get() { return _cefSettings->chrome_runtime == 1; }
96-
void set(bool value) { _cefSettings->chrome_runtime = value; }
97-
}
98-
9987
/// <summary>
10088
/// Set to true to disable configuration of browser process features using standard CEF and Chromium command-line arguments.
10189
/// Configuration can still be specified using CEF data structures or by adding to CefCommandLineArgs.
@@ -235,17 +223,6 @@ namespace CefSharp
235223
void set(String^ value) { StringUtils::AssignNativeFromClr(_cefSettings->javascript_flags, value); }
236224
}
237225

238-
/// <summary>
239-
/// Set to true to disable loading of pack files for resources and locales. A resource bundle handler must be provided for the
240-
/// browser and render processes via CefApp::GetResourceBundleHandler() if loading of pack files is disabled. Also configurable
241-
/// using the "disable-pack-loading" command- line switch.
242-
/// </summary>
243-
property bool PackLoadingDisabled
244-
{
245-
bool get() { return _cefSettings->pack_loading_disabled == 1; }
246-
void set(bool value) { _cefSettings->pack_loading_disabled = value; }
247-
}
248-
249226
/// <summary>
250227
/// Value that will be inserted as the product portion of the default User-Agent string. If empty the Chromium product version
251228
/// 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
312289
void set(bool value) { _cefSettings->persist_session_cookies = value; }
313290
}
314291

315-
/// <summary>
316-
/// To persist user preferences as a JSON file in the cache path directory set this value to true. A CachePath value must also be
317-
/// specified to enable this feature. Also configurable using the "persist-user-preferences" command-line switch. Can be
318-
/// overridden for individual RequestContext instances via the RequestContextSettings.PersistUserPreferences value.
319-
/// </summary>
320-
property bool PersistUserPreferences
321-
{
322-
bool get() { return _cefSettings->persist_user_preferences == 1; }
323-
void set(bool value) { _cefSettings->persist_user_preferences = value; }
324-
}
325-
326292
/// <summary>
327293
/// Comma delimited ordered list of language codes without any whitespace that will be used in the "Accept-Language" HTTP header.
328294
/// May be set globally using the CefSettings.AcceptLanguageList value. If both values are empty then "en-US,en" will be used.

CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj

-3
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@
239239
<ClCompile Include="CookieManager.cpp" />
240240
<ClCompile Include="Internals\CefBrowserHostWrapper.cpp" />
241241
<ClCompile Include="Internals\CefContextMenuParamsWrapper.cpp" />
242-
<ClCompile Include="Internals\CefExtensionWrapper.cpp" />
243242
<ClCompile Include="Internals\CefFrameWrapper.cpp" />
244243
<ClCompile Include="Internals\CefBrowserWrapper.cpp" />
245244
<ClCompile Include="Internals\CefRefCountManaged.cpp" />
@@ -277,8 +276,6 @@
277276
<ClInclude Include="Internals\CefRegistrationWrapper.h" />
278277
<ClInclude Include="Internals\CefResourceReadCallbackWrapper.h" />
279278
<ClInclude Include="Internals\CefCookieAccessFilterAdapter.h" />
280-
<ClInclude Include="Internals\CefExtensionHandlerAdapter.h" />
281-
<ClInclude Include="Internals\CefExtensionWrapper.h" />
282279
<ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h" />
283280
<ClInclude Include="Internals\CefResourceRequestHandlerAdapter.h" />
284281
<ClInclude Include="Internals\CefResourceSkipCallbackWrapper.h" />

CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj.filters

-9
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262
<ClCompile Include="Internals\CefValueWrapper.cpp">
6363
<Filter>Source Files</Filter>
6464
</ClCompile>
65-
<ClCompile Include="Internals\CefExtensionWrapper.cpp">
66-
<Filter>Source Files</Filter>
67-
</ClCompile>
6865
<ClCompile Include="RequestContext.cpp">
6966
<Filter>Source Files</Filter>
7067
</ClCompile>
@@ -259,12 +256,6 @@
259256
<ClInclude Include="Internals\CefGetExtensionResourceCallbackWrapper.h">
260257
<Filter>Header Files</Filter>
261258
</ClInclude>
262-
<ClInclude Include="Internals\CefExtensionWrapper.h">
263-
<Filter>Header Files</Filter>
264-
</ClInclude>
265-
<ClInclude Include="Internals\CefExtensionHandlerAdapter.h">
266-
<Filter>Header Files</Filter>
267-
</ClInclude>
268259
<ClInclude Include="Internals\CefRunFileDialogCallbackAdapter.h">
269260
<Filter>Header Files</Filter>
270261
</ClInclude>

CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp

-22
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "include\cef_parser.h"
1010

1111
#include "Cef.h"
12-
#include "CefExtensionWrapper.h"
1312
#include "CefTaskScheduler.h"
1413
#include "DragData.h"
1514
#include "CefRunFileDialogCallbackAdapter.h"
@@ -287,20 +286,6 @@ void CefBrowserHostWrapper::ReplaceMisspelling(String^ word)
287286
_browserHost->ReplaceMisspelling(StringUtils::ToNative(word));
288287
}
289288

290-
IExtension^ CefBrowserHostWrapper::Extension::get()
291-
{
292-
ThrowIfDisposed();
293-
294-
auto extension = _browserHost->GetExtension();
295-
296-
if (extension.get())
297-
{
298-
return gcnew CefExtensionWrapper(_browserHost->GetExtension());
299-
}
300-
301-
return nullptr;
302-
}
303-
304289
void CefBrowserHostWrapper::RunFileDialog(CefFileDialogMode mode, String^ title, String^ defaultFilePath, IList<String^>^ acceptFilters, IRunFileDialogCallback^ callback)
305290
{
306291
ThrowIfDisposed();
@@ -482,13 +467,6 @@ void CefBrowserHostWrapper::Invalidate(PaintElementType type)
482467
_browserHost->Invalidate((CefBrowserHost::PaintElementType)type);
483468
}
484469

485-
bool CefBrowserHostWrapper::IsBackgroundHost::get()
486-
{
487-
ThrowIfDisposed();
488-
489-
return _browserHost->IsBackgroundHost();
490-
}
491-
492470
void CefBrowserHostWrapper::ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<CefSharp::Structs::Range> replacementRange, Nullable<CefSharp::Structs::Range> selectionRange)
493471
{
494472
ThrowIfDisposed();

CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h

-10
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ namespace CefSharp
8181
virtual void AddWordToDictionary(String^ word);
8282
virtual void ReplaceMisspelling(String^ word);
8383

84-
virtual property IExtension^ Extension
85-
{
86-
IExtension^ get();
87-
}
88-
8984
virtual void RunFileDialog(CefFileDialogMode mode, String^ title, String^ defaultFilePath, IList<String^>^ acceptFilters, IRunFileDialogCallback^ callback);
9085

9186
virtual void Find(String^ searchText, bool forward, bool matchCase, bool findNext);
@@ -102,11 +97,6 @@ namespace CefSharp
10297

10398
virtual void Invalidate(PaintElementType type);
10499

105-
virtual property bool IsBackgroundHost
106-
{
107-
bool get();
108-
}
109-
110100
virtual void ImeSetComposition(String^ text, cli::array<CompositionUnderline>^ underlines, Nullable<CefSharp::Structs::Range> replacementRange, Nullable<CefSharp::Structs::Range> selectionRange);
111101
virtual void ImeCommitText(String^ text, Nullable<CefSharp::Structs::Range> replacementRange, int relativeCursorPos);
112102
virtual void ImeFinishComposingText(bool keepSelection);

CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h

-214
This file was deleted.

0 commit comments

Comments
 (0)