Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2290743002: Partial revert of https://codereview.chromium.org/1911973002/ (Closed)
Patch Set: comment in header Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 2430 matching lines...) Expand 10 before | Expand all | Expand 10 after
2441 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit; 2441 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit;
2442 } 2442 }
2443 2443
2444 void RenderViewImpl::OnSetRendererPrefs( 2444 void RenderViewImpl::OnSetRendererPrefs(
2445 const RendererPreferences& renderer_prefs) { 2445 const RendererPreferences& renderer_prefs) {
2446 std::string old_accept_languages = renderer_preferences_.accept_languages; 2446 std::string old_accept_languages = renderer_preferences_.accept_languages;
2447 2447
2448 renderer_preferences_ = renderer_prefs; 2448 renderer_preferences_ = renderer_prefs;
2449 2449
2450 UpdateFontRenderingFromRendererPrefs(); 2450 UpdateFontRenderingFromRendererPrefs();
2451 UpdateThemePrefs();
2451 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); 2452 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval);
2452 2453
2453 #if defined(USE_DEFAULT_RENDER_THEME) 2454 #if defined(USE_DEFAULT_RENDER_THEME)
2454 if (renderer_prefs.use_custom_colors) { 2455 if (renderer_prefs.use_custom_colors) {
2455 blink::setFocusRingColor(renderer_prefs.focus_ring_color); 2456 blink::setFocusRingColor(renderer_prefs.focus_ring_color);
2456 2457
2457 if (webview()) { 2458 if (webview()) {
2458 webview()->setSelectionColors( 2459 webview()->setSelectionColors(
2459 renderer_prefs.active_selection_bg_color, 2460 renderer_prefs.active_selection_bg_color,
2460 renderer_prefs.active_selection_fg_color, 2461 renderer_prefs.active_selection_fg_color,
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
3060 return render_frame->focused_pepper_plugin(); 3061 return render_frame->focused_pepper_plugin();
3061 } 3062 }
3062 frame = frame->traverseNext(false); 3063 frame = frame->traverseNext(false);
3063 } 3064 }
3064 3065
3065 return nullptr; 3066 return nullptr;
3066 } 3067 }
3067 #endif 3068 #endif
3068 3069
3069 } // namespace content 3070 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698