bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 234212

Browse Source 
- The CefBrowserSettings.user_style_sheet_location option is no longer supported in Blink.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1516 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-11-11 17:29:52 +00:00
parent 81f336f4bb
commit 7e1fbaca6a
8 changed files with 9 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libcef/browser/browser_settings.cc
View File

@@ -22,13 +22,6 @@ void SetDefaults(WebPreferences& web) {
command_line.GetSwitchValueASCII(switches::kDefaultEncoding);
}
if (command_line.HasSwitch(switches::kUserStyleSheetLocation)) {
web.user_style_sheet_location = GURL(
command_line.GetSwitchValueASCII(switches::kUserStyleSheetLocation));
if (!web.user_style_sheet_location.is_empty())
web.user_style_sheet_enabled = true;
}
web.javascript_can_open_windows_automatically =
!command_line.HasSwitch(switches::kDisableJavascriptOpenWindows);
web.allow_scripts_to_close_windows =
@@ -102,12 +95,6 @@ void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web) {
if (cef.default_encoding.length > 0)
web.default_encoding = CefString(&cef.default_encoding);
if (cef.user_style_sheet_location.length > 0) {
web.user_style_sheet_enabled = true;
web.user_style_sheet_location =
GURL(CefString(&cef.user_style_sheet_location).ToString());
}
SET_STATE(cef.remote_fonts, web.remote_fonts_enabled);
SET_STATE(cef.javascript, web.javascript_enabled);
SET_STATE(cef.javascript_open_windows,