OLD | NEW |
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 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 3347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3358 const gfx::Size& disable_scrollbar_size_limit) { | 3358 const gfx::Size& disable_scrollbar_size_limit) { |
3359 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit; | 3359 disable_scrollbars_size_limit_ = disable_scrollbar_size_limit; |
3360 } | 3360 } |
3361 | 3361 |
3362 void RenderViewImpl::OnSetRendererPrefs( | 3362 void RenderViewImpl::OnSetRendererPrefs( |
3363 const RendererPreferences& renderer_prefs) { | 3363 const RendererPreferences& renderer_prefs) { |
3364 double old_zoom_level = renderer_preferences_.default_zoom_level; | 3364 double old_zoom_level = renderer_preferences_.default_zoom_level; |
3365 renderer_preferences_ = renderer_prefs; | 3365 renderer_preferences_ = renderer_prefs; |
3366 UpdateFontRenderingFromRendererPrefs(); | 3366 UpdateFontRenderingFromRendererPrefs(); |
3367 | 3367 |
3368 #if defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) | 3368 #if defined(USE_DEFAULT_RENDER_THEME) |
3369 if (renderer_prefs.use_custom_colors) { | 3369 if (renderer_prefs.use_custom_colors) { |
3370 WebColorName name = blink::WebColorWebkitFocusRingColor; | 3370 WebColorName name = blink::WebColorWebkitFocusRingColor; |
3371 blink::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); | 3371 blink::setNamedColors(&name, &renderer_prefs.focus_ring_color, 1); |
3372 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); | 3372 blink::setCaretBlinkInterval(renderer_prefs.caret_blink_interval); |
3373 #if defined(TOOLKIT_GTK) | |
3374 ui::NativeTheme::instance()->SetScrollbarColors( | |
3375 renderer_prefs.thumb_inactive_color, | |
3376 renderer_prefs.thumb_active_color, | |
3377 renderer_prefs.track_color); | |
3378 #endif // defined(TOOLKIT_GTK) | |
3379 | 3373 |
3380 if (webview()) { | 3374 if (webview()) { |
3381 webview()->setSelectionColors( | 3375 webview()->setSelectionColors( |
3382 renderer_prefs.active_selection_bg_color, | 3376 renderer_prefs.active_selection_bg_color, |
3383 renderer_prefs.active_selection_fg_color, | 3377 renderer_prefs.active_selection_fg_color, |
3384 renderer_prefs.inactive_selection_bg_color, | 3378 renderer_prefs.inactive_selection_bg_color, |
3385 renderer_prefs.inactive_selection_fg_color); | 3379 renderer_prefs.inactive_selection_fg_color); |
3386 webview()->themeChanged(); | 3380 webview()->themeChanged(); |
3387 } | 3381 } |
3388 } | 3382 } |
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4593 std::vector<gfx::Size> sizes(icon_urls[i].sizes().size()); | 4587 std::vector<gfx::Size> sizes(icon_urls[i].sizes().size()); |
4594 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4588 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4595 if (!url.isEmpty()) | 4589 if (!url.isEmpty()) |
4596 urls.push_back( | 4590 urls.push_back( |
4597 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4591 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4598 } | 4592 } |
4599 SendUpdateFaviconURL(urls); | 4593 SendUpdateFaviconURL(urls); |
4600 } | 4594 } |
4601 | 4595 |
4602 } // namespace content | 4596 } // namespace content |
OLD | NEW |