Commit f8e279d3 authored by Christopher Cameron's avatar Christopher Cameron Committed by Commit Bot

Re-protect custom colors with USE_AURA

In crrev.com/659558, we removed a number of ifdef guards that appeared
to be redundant. Apparently they weren't. Replace what used to be
USE_DEFAULT_RENDER_THEME with USE_AURA (which was equivalent).

Bug: 963366
Change-Id: I1ffcd83e780a92529f5449a014fe7dc06f6fc07b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1612853Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660045}
parent 5a173404
...@@ -118,8 +118,6 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs, ...@@ -118,8 +118,6 @@ void UpdateFromSystemSettings(blink::mojom::RendererPreferences* prefs,
prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA); prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
prefs->inactive_selection_fg_color = SK_ColorBLACK; prefs->inactive_selection_fg_color = SK_ColorBLACK;
#endif #endif
#else
prefs->use_custom_colors = false;
#endif #endif
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
......
...@@ -1969,6 +1969,7 @@ void RenderViewImpl::OnSetRendererPrefs( ...@@ -1969,6 +1969,7 @@ void RenderViewImpl::OnSetRendererPrefs(
: base::TimeDelta::FromMilliseconds( : base::TimeDelta::FromMilliseconds(
blink::mojom::kDefaultCaretBlinkIntervalInMilliseconds)); blink::mojom::kDefaultCaretBlinkIntervalInMilliseconds));
#if defined(USE_AURA)
if (renderer_prefs.use_custom_colors) { if (renderer_prefs.use_custom_colors) {
blink::SetFocusRingColor(renderer_prefs.focus_ring_color); blink::SetFocusRingColor(renderer_prefs.focus_ring_color);
blink::SetSelectionColors(renderer_prefs.active_selection_bg_color, blink::SetSelectionColors(renderer_prefs.active_selection_bg_color,
...@@ -1978,6 +1979,7 @@ void RenderViewImpl::OnSetRendererPrefs( ...@@ -1978,6 +1979,7 @@ void RenderViewImpl::OnSetRendererPrefs(
if (webview()) if (webview())
webview()->MainFrameWidget()->ThemeChanged(); webview()->MainFrameWidget()->ThemeChanged();
} }
#endif
if (webview() && if (webview() &&
old_accept_languages != renderer_preferences_.accept_languages) { old_accept_languages != renderer_preferences_.accept_languages) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment