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

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

Issue 586933003: fling: Remove a bunch of code for configuring fling curves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar Created 6 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
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3076 matching lines...) Expand 10 before | Expand all | Expand 10 after
3087 webview()->setSelectionColors( 3087 webview()->setSelectionColors(
3088 renderer_prefs.active_selection_bg_color, 3088 renderer_prefs.active_selection_bg_color,
3089 renderer_prefs.active_selection_fg_color, 3089 renderer_prefs.active_selection_fg_color,
3090 renderer_prefs.inactive_selection_bg_color, 3090 renderer_prefs.inactive_selection_bg_color,
3091 renderer_prefs.inactive_selection_fg_color); 3091 renderer_prefs.inactive_selection_fg_color);
3092 webview()->themeChanged(); 3092 webview()->themeChanged();
3093 } 3093 }
3094 } 3094 }
3095 #endif // defined(USE_DEFAULT_RENDER_THEME) 3095 #endif // defined(USE_DEFAULT_RENDER_THEME)
3096 3096
3097 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
3098 RenderThreadImpl::current()->SetFlingCurveParameters(
3099 renderer_prefs.touchpad_fling_profile,
3100 renderer_prefs.touchscreen_fling_profile);
3101
3102 // If the zoom level for this page matches the old zoom default, and this 3097 // If the zoom level for this page matches the old zoom default, and this
3103 // is not a plugin, update the zoom level to match the new default. 3098 // is not a plugin, update the zoom level to match the new default.
3104 if (webview() && webview()->mainFrame()->isWebLocalFrame() && 3099 if (webview() && webview()->mainFrame()->isWebLocalFrame() &&
3105 !webview()->mainFrame()->document().isPluginDocument() && 3100 !webview()->mainFrame()->document().isPluginDocument() &&
3106 !ZoomValuesEqual(old_zoom_level, 3101 !ZoomValuesEqual(old_zoom_level,
3107 renderer_preferences_.default_zoom_level) && 3102 renderer_preferences_.default_zoom_level) &&
3108 ZoomValuesEqual(webview()->zoomLevel(), old_zoom_level)) { 3103 ZoomValuesEqual(webview()->zoomLevel(), old_zoom_level)) {
3109 webview()->setZoomLevel(renderer_preferences_.default_zoom_level); 3104 webview()->setZoomLevel(renderer_preferences_.default_zoom_level);
3110 zoomLevelChanged(); 3105 zoomLevelChanged();
3111 } 3106 }
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
4216 std::vector<gfx::Size> sizes; 4211 std::vector<gfx::Size> sizes;
4217 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4212 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4218 if (!url.isEmpty()) 4213 if (!url.isEmpty())
4219 urls.push_back( 4214 urls.push_back(
4220 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4215 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4221 } 4216 }
4222 SendUpdateFaviconURL(urls); 4217 SendUpdateFaviconURL(urls);
4223 } 4218 }
4224 4219
4225 } // namespace content 4220 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698