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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2536723007: Removed android scrolling fake mouse moves and device_supports_mouse (Closed)
Patch Set: rebase Created 4 years 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 | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('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/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 touch_enabled_switch == 459 touch_enabled_switch ==
460 switches::kTouchEventFeatureDetectionEnabled); 460 switches::kTouchEventFeatureDetectionEnabled);
461 std::tie(prefs.available_pointer_types, prefs.available_hover_types) = 461 std::tie(prefs.available_pointer_types, prefs.available_hover_types) =
462 ui::GetAvailablePointerAndHoverTypes(); 462 ui::GetAvailablePointerAndHoverTypes();
463 prefs.primary_pointer_type = 463 prefs.primary_pointer_type =
464 ui::GetPrimaryPointerType(prefs.available_pointer_types); 464 ui::GetPrimaryPointerType(prefs.available_pointer_types);
465 prefs.primary_hover_type = 465 prefs.primary_hover_type =
466 ui::GetPrimaryHoverType(prefs.available_hover_types); 466 ui::GetPrimaryHoverType(prefs.available_hover_types);
467 467
468 #if defined(OS_ANDROID) 468 #if defined(OS_ANDROID)
469 prefs.device_supports_mouse = false;
470
471 prefs.video_fullscreen_orientation_lock_enabled = 469 prefs.video_fullscreen_orientation_lock_enabled =
472 base::FeatureList::IsEnabled(media::kVideoFullscreenOrientationLock) && 470 base::FeatureList::IsEnabled(media::kVideoFullscreenOrientationLock) &&
473 ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE; 471 ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_PHONE;
474 #endif 472 #endif
475 473
476 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints(); 474 prefs.pointer_events_max_touch_points = ui::MaxTouchPoints();
477 475
478 prefs.touch_adjustment_enabled = 476 prefs.touch_adjustment_enabled =
479 !command_line.HasSwitch(switches::kDisableTouchAdjustment); 477 !command_line.HasSwitch(switches::kDisableTouchAdjustment);
480 478
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 } else { 1091 } else {
1094 render_view_ready_on_process_launch_ = true; 1092 render_view_ready_on_process_launch_ = true;
1095 } 1093 }
1096 } 1094 }
1097 1095
1098 void RenderViewHostImpl::RenderViewReady() { 1096 void RenderViewHostImpl::RenderViewReady() {
1099 delegate_->RenderViewReady(this); 1097 delegate_->RenderViewReady(this);
1100 } 1098 }
1101 1099
1102 } // namespace content 1100 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698