Skip to content

Implemented all CEF3 BrowserSettings #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 13, 2014
Merged

Implemented all CEF3 BrowserSettings #326

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ba1660
Improved BrowserSettings
fraenke75 Apr 15, 2014
912895f
Removed unwanted changes from WebView and commited correct BrowserSet…
fraenke75 Apr 15, 2014
0e05afb
Reverted all changes from WebView.cs
fraenke75 Apr 15, 2014
65bb730
Removed Browsersetting which are not supported in CEF3
fraenke75 Apr 15, 2014
e78aaf3
Used Nullable<bool> again and changed names
fraenke75 Apr 17, 2014
517afb2
Removed trailing space and updated copyright year
fraenke75 Apr 22, 2014
e4e95bb
Changed JavaScriptDisabled to JavascriptDisabled
fraenke75 Apr 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 100 additions & 157 deletions CefSharp.Core/BrowserSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright � 2010-2013 The CefSharp Project. All rights reserved.
// Copyright � 2010-2014 The CefSharp Project. All rights reserved.
//
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.

Expand All @@ -9,25 +9,50 @@ using namespace CefSharp::Internals;

namespace CefSharp
{
Nullable<bool> CefStateToBoolean(cef_state_t state)
Nullable<bool> CefStateToDisabledSetting(cef_state_t state)
{
if (state == STATE_DEFAULT)
if (state == STATE_ENABLED)
{
return Nullable<bool>();
return Nullable<bool>(false);
}
else if (state == STATE_DISABLED)
{
return Nullable<bool>(true);
}
return Nullable<bool>();
}

cef_state_t CefStateFromDisabledSetting(Nullable<bool>^ value)
{
if (value == nullptr)
{
return STATE_DEFAULT;
}
else if (value->Value)
{
return STATE_DISABLED;
}
else if (state == STATE_ENABLED)
else // !value->Value
{
return STATE_ENABLED;
}
return STATE_DEFAULT;
}

Nullable<bool> CefStateToEnabledSetting(cef_state_t state)
{
if (state == STATE_ENABLED)
{
return Nullable<bool>(true);
}
else if (state == STATE_DISABLED)
{
return Nullable<bool>(false);
}

return Nullable<bool>();
}

cef_state_t CefStateFromBoolean(Nullable<bool>^ value)
cef_state_t CefStateFromEnabledSetting(Nullable<bool>^ value)
{
if (value == nullptr)
{
Expand All @@ -41,7 +66,6 @@ namespace CefSharp
{
return STATE_DISABLED;
}

return STATE_DEFAULT;
}

Expand Down Expand Up @@ -124,8 +148,8 @@ namespace CefSharp

property Nullable<bool>^ RemoteFontsDisabled
{
Nullable<bool>^ get() { return CefStateToBoolean(_browserSettings->remote_fonts); }
void set(Nullable<bool>^ value) { _browserSettings->remote_fonts = CefStateFromBoolean(value); }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->remote_fonts); }
void set(Nullable<bool>^ value) { _browserSettings->remote_fonts = CefStateFromDisabledSetting(value); }
}

property String^ DefaultEncoding
Expand All @@ -134,217 +158,136 @@ namespace CefSharp
void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->default_encoding, value); }
}

// TODO: Convert the rest to use the CefStateToFoo syntax.
/*
property bool EncodingDetectorEnabled
{
bool get() { return _browserSettings->encoding_detector_enabled; }
void set(bool value) { _browserSettings->encoding_detector_enabled = value; }
}

property bool JavaScriptDisabled
property Nullable<bool>^ JavascriptDisabled
{
bool get() { return _browserSettings->javascript_disabled; }
void set(bool value) { _browserSettings->javascript_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->javascript); }
void set(Nullable<bool>^ value) { _browserSettings->javascript = CefStateFromDisabledSetting(value); }
}

property bool JavaScriptOpenWindowsDisallowed
property Nullable<bool>^ JavaScriptOpenWindowsDisabled
{
bool get() { return _browserSettings->javascript_open_windows_disallowed; }
void set(bool value) { _browserSettings->javascript_open_windows_disallowed = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_open_windows); }
void set(Nullable<bool>^ value) { _browserSettings->javascript_open_windows = CefStateFromDisabledSetting(value); }
}

property bool JavaScriptCloseWindowsDisallowed
property Nullable<bool>^ JavaScriptCloseWindowsDisabled
{
bool get() { return _browserSettings->javascript_close_windows_disallowed; }
void set(bool value) { _browserSettings->javascript_close_windows_disallowed = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_close_windows); }
void set(Nullable<bool>^ value) { _browserSettings->javascript_close_windows = CefStateFromDisabledSetting(value); }
}

property bool JavaScriptAccessClipboardDisallowed
property Nullable<bool>^ JavaScriptAccessClipboardDisabled
{
bool get() { return _browserSettings->javascript_access_clipboard_disallowed; }
void set(bool value) { _browserSettings->javascript_access_clipboard_disallowed = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_access_clipboard); }
void set(Nullable<bool>^ value) { _browserSettings->javascript_access_clipboard = CefStateFromDisabledSetting(value); }
}

property bool DomPasteDisabled
property Nullable<bool>^ JavascriptDomPasteDisabled
{
bool get() { return _browserSettings->dom_paste_disabled; }
void set(bool value) { _browserSettings->dom_paste_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->javascript_dom_paste); }
void set(Nullable<bool>^ value) { _browserSettings->javascript_dom_paste = CefStateFromDisabledSetting(value); }
}

property bool CaretBrowsingEnabled
property Nullable<bool>^ CaretBrowsingEnabled
{
bool get() { return _browserSettings->caret_browsing_enabled; }
void set(bool value) { _browserSettings->caret_browsing_enabled = value; }
Nullable<bool>^ get() { return CefStateToEnabledSetting(_browserSettings->caret_browsing); }
void set(Nullable<bool>^ value) { _browserSettings->caret_browsing = CefStateFromEnabledSetting(value); }
}

property bool JavaDisabled
property Nullable<bool>^ JavaDisabled
{
bool get() { return _browserSettings->java_disabled; }
void set(bool value) { _browserSettings->java_disabled = value; }
}

property bool PluginsDisabled
{
bool get() { return _browserSettings->plugins_disabled; }
void set(bool value) { _browserSettings->plugins_disabled = value; }
}
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->java); }
void set(Nullable<bool>^ value) { _browserSettings->java = CefStateFromDisabledSetting(value); }
}

property bool UniversalAccessFromFileUrlsAllowed
property Nullable<bool>^ PluginsDisabled
{
bool get() { return _browserSettings->universal_access_from_file_urls_allowed; }
void set(bool value) { _browserSettings->universal_access_from_file_urls_allowed = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->plugins); }
void set(Nullable<bool>^ value) { _browserSettings->plugins = CefStateFromDisabledSetting(value); }
}

property bool FileAccessFromFileUrlsAllowed
property Nullable<bool>^ UniversalAccessFromFileUrlsAllowed
{
bool get() { return _browserSettings->file_access_from_file_urls_allowed; }
void set(bool value) { _browserSettings->file_access_from_file_urls_allowed = value; }
Nullable<bool>^ get() { return CefStateToEnabledSetting(_browserSettings->universal_access_from_file_urls); }
void set(Nullable<bool>^ value) { _browserSettings->universal_access_from_file_urls = CefStateFromEnabledSetting(value); }
}

property bool WebSecurityDisabled
property Nullable<bool>^ FileAccessFromFileUrlsAllowed
{
bool get() { return _browserSettings->web_security_disabled; }
void set(bool value) { _browserSettings->web_security_disabled = value; }
Nullable<bool>^ get() { return CefStateToEnabledSetting(_browserSettings->file_access_from_file_urls); }
void set(Nullable<bool>^ value) { _browserSettings->file_access_from_file_urls = CefStateFromEnabledSetting(value); }
}

property bool XssAuditorEnabled
property Nullable<bool>^ WebSecurityDisabled
{
bool get() { return _browserSettings->xss_auditor_enabled; }
void set(bool value) { _browserSettings->xss_auditor_enabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->web_security); }
void set(Nullable<bool>^ value) { _browserSettings->web_security = CefStateFromDisabledSetting(value); }
}

property bool ImageLoadDisabled
property Nullable<bool>^ ImageLoadingDisabled
{
bool get() { return _browserSettings->image_load_disabled; }
void set(bool value) { _browserSettings->image_load_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->image_loading); }
void set(Nullable<bool>^ value) { _browserSettings->image_loading = CefStateFromDisabledSetting(value); }
}

property bool ShrinkStandaloneImagesToFit
property Nullable<bool>^ ImageShrinkStandaloneToFitEnabled
{
bool get() { return _browserSettings->shrink_standalone_images_to_fit; }
void set(bool value) { _browserSettings->shrink_standalone_images_to_fit = value; }
Nullable<bool>^ get() { return CefStateToEnabledSetting(_browserSettings->image_shrink_standalone_to_fit); }
void set(Nullable<bool>^ value) { _browserSettings->image_shrink_standalone_to_fit= CefStateFromEnabledSetting(value); }
}

property bool SiteSpecificQuirksDisabled
property Nullable<bool>^ TextAreaResizeDisabled
{
bool get() { return _browserSettings->site_specific_quirks_disabled; }
void set(bool value) { _browserSettings->site_specific_quirks_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->text_area_resize); }
void set(Nullable<bool>^ value) { _browserSettings->text_area_resize = CefStateFromDisabledSetting(value); }
}

property bool TextAreaResizeDisabled
property Nullable<bool>^ TabToLinksDisabled
{
bool get() { return _browserSettings->text_area_resize_disabled; }
void set(bool value) { _browserSettings->text_area_resize_disabled = value; }
}

property bool PageCacheDisabled
{
bool get() { return _browserSettings->page_cache_disabled; }
void set(bool value) { _browserSettings->page_cache_disabled = value; }
}

property bool TabToLinksDisabled
{
bool get() { return _browserSettings->tab_to_links_disabled; }
void set(bool value) { _browserSettings->tab_to_links_disabled = value; }
}

property bool HyperlinkAuditingDisabled
{
bool get() { return _browserSettings->hyperlink_auditing_disabled; }
void set(bool value) { _browserSettings->hyperlink_auditing_disabled = value; }
}

property bool UserStyleSheetEnabled
{
bool get() { return _browserSettings->user_style_sheet_enabled; }
void set(bool value) { _browserSettings->user_style_sheet_enabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->tab_to_links); }
void set(Nullable<bool>^ value) { _browserSettings->tab_to_links = CefStateFromDisabledSetting(value); }
}

property String^ UserStyleSheetLocation
{
String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); }
void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); }
}

property bool AuthorAndUserStylesDisabled
{
bool get() { return _browserSettings->author_and_user_styles_disabled; }
void set(bool value) { _browserSettings->author_and_user_styles_disabled = value; }
}

property bool LocalStorageDisabled
{
bool get() { return _browserSettings->local_storage_disabled; }
void set(bool value) { _browserSettings->local_storage_disabled = value; }
}

property bool DatabasesDisabled
{
bool get() { return _browserSettings->databases_disabled; }
void set(bool value) { _browserSettings->databases_disabled = value; }
}

property bool ApplicationCacheDisabled
{
bool get() { return _browserSettings->application_cache_disabled; }
void set(bool value) { _browserSettings->application_cache_disabled = value; }
}

property bool WebGlDisabled
{
bool get() { return _browserSettings->webgl_disabled; }
void set(bool value) { _browserSettings->webgl_disabled = value; }
}

property bool AcceleratedCompositingEnabled
{
bool get() { return _browserSettings->accelerated_compositing_enabled; }
void set(bool value) { _browserSettings->accelerated_compositing_enabled = value; }
}

property bool AcceleratedLayersDisabled
{
bool get() { return _browserSettings->accelerated_layers_disabled; }
void set(bool value) { _browserSettings->accelerated_layers_disabled = value; }
String^ get() { return StringUtils::ToClr(_browserSettings->user_style_sheet_location); }
void set(String^ value) { StringUtils::AssignNativeFromClr(_browserSettings->user_style_sheet_location, value); }
}

property bool Accelerated2dCanvasDisabled
property Nullable<bool>^ AuthorAndUserStylesDisabled
{
bool get() { return _browserSettings->accelerated_2d_canvas_disabled; }
void set(bool value) { _browserSettings->accelerated_2d_canvas_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->author_and_user_styles); }
void set(Nullable<bool>^ value) { _browserSettings->author_and_user_styles = CefStateFromDisabledSetting(value); }
}

property bool AcceleratedPaintingDisabled
property Nullable<bool>^ LocalStorageDisabled
{
bool get() { return _browserSettings->accelerated_painting_disabled; }
void set(bool value) { _browserSettings->accelerated_painting_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->local_storage); }
void set(Nullable<bool>^ value) { _browserSettings->local_storage = CefStateFromDisabledSetting(value); }
}

property bool AcceleratedFiltersDisabled
property Nullable<bool>^ DatabasesDisabled
{
bool get() { return _browserSettings->accelerated_filters_disabled; }
void set(bool value) { _browserSettings->accelerated_filters_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->databases); }
void set(Nullable<bool>^ value) { _browserSettings->databases = CefStateFromDisabledSetting(value); }
}

property bool AcceleratedPluginsDisabled
property Nullable<bool>^ ApplicationCacheDisabled
{
bool get() { return _browserSettings->accelerated_plugins_disabled; }
void set(bool value) { _browserSettings->accelerated_plugins_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->application_cache); }
void set(Nullable<bool>^ value) { _browserSettings->application_cache = CefStateFromDisabledSetting(value); }
}

property bool DeveloperToolsDisabled
property Nullable<bool>^ WebGlDisabled
{
bool get() { return _browserSettings->developer_tools_disabled; }
void set(bool value) { _browserSettings->developer_tools_disabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->webgl); }
void set(Nullable<bool>^ value) { _browserSettings->webgl = CefStateFromDisabledSetting(value); }
}

property bool FullscreenEnabled
property Nullable<bool>^ AcceleratedCompositingDisabled
{
bool get() { return _browserSettings->fullscreen_enabled; }
void set(bool value) { _browserSettings->fullscreen_enabled = value; }
Nullable<bool>^ get() { return CefStateToDisabledSetting(_browserSettings->accelerated_compositing); }
void set(Nullable<bool>^ value) { _browserSettings->accelerated_compositing = CefStateFromDisabledSetting(value); }
}
*/
};
}