bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cef/patch/patches/renderer_preferences_util_5...

25 lines
1.1 KiB
Diff
Raw Normal View History

Use git apply for applying patch files (issue #1825)
2017-04-27 03:59:52 +02:00
diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
Update to Chromium revision 5fdc0fab (#520840) - Windows now builds with clang by default.
2017-12-07 22:44:24 +01:00
index ef8350dd1f99..601db5845c8a 100644
Use git apply for applying patch files (issue #1825)
2017-04-27 03:59:52 +02:00
--- chrome/browser/renderer_preferences_util.cc
+++ chrome/browser/renderer_preferences_util.cc
Update to Chromium revision ad51088c (#444943)
2017-01-23 18:36:54 +01:00
@@ -32,7 +32,8 @@
Update to Chromium revision 9cedf753 (#418732) - Simplify usage of OnBeforePluginLoad (issue #2015) - Switch crash reporting from crashpad to breakpad on Windows and OS X. Adds a new chrome_elf.dll dependency on Windows (issue #1995) - Remove CefTextfield::GetPlaceholderTextColor() method which is no longer supported by Chromium.
2016-10-17 20:14:44 +02:00
#include "ui/base/cocoa/defaults_utils.h"
- Support runtime configuration of renderer-related preferences (issue #1501). - Persist modified user preferences including per-host zoom settings when a cache_path value is specified and persist_user_preferences is set to true via CefSettings or CefRequestContextSettings. - Avoid the need to duplicate files from chrome/ by having CefBrowserContext extend Chrome's Profile class.
2015-10-17 02:44:00 +02:00
#endif
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
+ defined(ENABLE_THEMES)
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h"
Update to Chromium revision 5fdc0fab (#520840) - Windows now builds with clang by default.
2017-12-07 22:44:24 +01:00
@@ -136,7 +137,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
prefs->caret_blink_interval = interval;
- Support runtime configuration of renderer-related preferences (issue #1501). - Persist modified user preferences including per-host zoom settings when a cache_path value is specified and persist_user_preferences is set to true via CefSettings or CefRequestContextSettings. - Avoid the need to duplicate files from chrome/ by having CefBrowserContext extend Chrome's Profile class.
2015-10-17 02:44:00 +02:00
#endif
-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) && \
+ defined(ENABLE_THEMES)
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {