mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-16 20:02:24 +01:00
936e595fe5
- 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.
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
diff --git renderer_preferences_util.cc renderer_preferences_util.cc
|
|
index f7628fe..e2f1451 100644
|
|
--- renderer_preferences_util.cc
|
|
+++ renderer_preferences_util.cc
|
|
@@ -25,7 +25,8 @@
|
|
#include "ui/views/controls/textfield/textfield.h"
|
|
#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"
|
|
@@ -81,7 +82,8 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
|
|
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
|
|
#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()) {
|