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

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

Issue 43503002: Remove fling curve profiles from renderer preferences assuming that be turn on Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
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 5257 matching lines...) Expand 10 before | Expand all | Expand 10 after
5268 webview()->setSelectionColors( 5268 webview()->setSelectionColors(
5269 renderer_prefs.active_selection_bg_color, 5269 renderer_prefs.active_selection_bg_color,
5270 renderer_prefs.active_selection_fg_color, 5270 renderer_prefs.active_selection_fg_color,
5271 renderer_prefs.inactive_selection_bg_color, 5271 renderer_prefs.inactive_selection_bg_color,
5272 renderer_prefs.inactive_selection_fg_color); 5272 renderer_prefs.inactive_selection_fg_color);
5273 webview()->themeChanged(); 5273 webview()->themeChanged();
5274 } 5274 }
5275 } 5275 }
5276 #endif // defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK) 5276 #endif // defined(USE_DEFAULT_RENDER_THEME) || defined(TOOLKIT_GTK)
5277 5277
5278 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
5279 RenderThreadImpl::current()->SetFlingCurveParameters(
5280 renderer_prefs.touchpad_fling_profile,
5281 renderer_prefs.touchscreen_fling_profile);
5282
5283 // If the zoom level for this page matches the old zoom default, and this 5278 // If the zoom level for this page matches the old zoom default, and this
5284 // is not a plugin, update the zoom level to match the new default. 5279 // is not a plugin, update the zoom level to match the new default.
5285 if (webview() && !webview()->mainFrame()->document().isPluginDocument() && 5280 if (webview() && !webview()->mainFrame()->document().isPluginDocument() &&
5286 !ZoomValuesEqual(old_zoom_level, 5281 !ZoomValuesEqual(old_zoom_level,
5287 renderer_preferences_.default_zoom_level) && 5282 renderer_preferences_.default_zoom_level) &&
5288 ZoomValuesEqual(webview()->zoomLevel(), old_zoom_level)) { 5283 ZoomValuesEqual(webview()->zoomLevel(), old_zoom_level)) {
5289 webview()->setZoomLevel(renderer_preferences_.default_zoom_level); 5284 webview()->setZoomLevel(renderer_preferences_.default_zoom_level);
5290 zoomLevelChanged(); 5285 zoomLevelChanged();
5291 } 5286 }
5292 } 5287 }
(...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
6583 for (size_t i = 0; i < icon_urls.size(); i++) { 6578 for (size_t i = 0; i < icon_urls.size(); i++) {
6584 WebURL url = icon_urls[i].iconURL(); 6579 WebURL url = icon_urls[i].iconURL();
6585 if (!url.isEmpty()) 6580 if (!url.isEmpty())
6586 urls.push_back(FaviconURL(url, 6581 urls.push_back(FaviconURL(url,
6587 ToFaviconType(icon_urls[i].iconType()))); 6582 ToFaviconType(icon_urls[i].iconType())));
6588 } 6583 }
6589 SendUpdateFaviconURL(urls); 6584 SendUpdateFaviconURL(urls);
6590 } 6585 }
6591 6586
6592 } // namespace content 6587 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/renderer_preferences.cc ('k') | ui/events/gestures/gesture_configuration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698