| Index: content/browser/renderer_host/render_view_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
| index 70ac69daf2195b6d5b95b343415845f450730b70..4317cfe5f98f2abd85a558eec8fe42d80e62c1b0 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_view_host_impl.cc
|
| @@ -499,10 +499,12 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
|
| prefs.device_supports_touch = prefs.touch_enabled &&
|
| ui::GetTouchScreensAvailability() ==
|
| ui::TouchScreensAvailability::ENABLED;
|
| - prefs.available_pointer_types = ui::GetAvailablePointerTypes();
|
| - prefs.primary_pointer_type = ui::GetPrimaryPointerType();
|
| - prefs.available_hover_types = ui::GetAvailableHoverTypes();
|
| - prefs.primary_hover_type = ui::GetPrimaryHoverType();
|
| + std::tie(prefs.available_pointer_types, prefs.available_hover_types) =
|
| + ui::GetAvailablePointerAndHoverTypes();
|
| + prefs.primary_pointer_type =
|
| + ui::GetPrimaryPointerType(prefs.available_pointer_types);
|
| + prefs.primary_hover_type =
|
| + ui::GetPrimaryHoverType(prefs.available_hover_types);
|
|
|
| #if defined(OS_ANDROID)
|
| prefs.device_supports_mouse = false;
|
|
|