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

Unified Diff: chrome/browser/ui/views/frame/browser_root_view.cc

Issue 139983009: ui::LocatedEvent location() returns gfx::PointF (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Undo accidental change. Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_root_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index 1c6563d11371a58a1a1fa8a2efed7fb25ae6640c..be10dd243c845f3d8168c0d9e6c2f28eb8e262b1 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -123,7 +123,8 @@ bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
if (browser_defaults::kScrollEventChangesTab) {
// Switch to the left/right tab if the wheel-scroll happens over the
// tabstrip, or the empty space beside the tabstrip.
- views::View* hit_view = GetEventHandlerForPoint(event.location());
+ views::View* hit_view =
+ GetEventHandlerForPoint(gfx::ToFlooredPoint(event.location()));
views::NonClientView* non_client = GetWidget()->non_client_view();
if (tabstrip()->Contains(hit_view) ||
hit_view == non_client->frame_view()) {
@@ -150,8 +151,9 @@ bool BrowserRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
void BrowserRootView::DispatchGestureEvent(ui::GestureEvent* event) {
if (event->type() == ui::ET_GESTURE_TAP &&
- event->location().y() <= 0 &&
- event->location().x() <= browser_view_->GetBounds().width()) {
+ gfx::ToFlooredPoint(event->location()).y() <= 0 &&
+ gfx::ToFlooredPoint(event->location()).x() <=
+ browser_view_->GetBounds().width()) {
TouchUMA::RecordGestureAction(TouchUMA::GESTURE_ROOTVIEWTOP_TAP);
}
@@ -173,7 +175,7 @@ bool BrowserRootView::ShouldForwardToTabStrip(
ui::DropTargetEvent* BrowserRootView::MapEventToTabStrip(
const ui::DropTargetEvent& event,
const ui::OSExchangeData& data) {
- gfx::Point tab_strip_loc(event.location());
+ gfx::Point tab_strip_loc(gfx::ToFlooredPoint(event.location()));
ConvertPointToTarget(this, tabstrip(), &tab_strip_loc);
return new ui::DropTargetEvent(data, tab_strip_loc, tab_strip_loc,
event.source_operations());

Powered by Google App Engine
This is Rietveld 408576698