ash/shelf/shelf_view.cc - Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_view.cc

Issue 1260453006: ui: events: Add a class to hold common touch and stylus properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address build problems, add accessor and unit tests. Created 5 years, 4 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: ash/shelf/shelf_view.cc

diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc

index 9f3fe0a05165812de2521df3fe5ff67c16a4a677..32d22914a99442e0903e74eeb06d8ab2514283d5 100644

--- a/ash/shelf/shelf_view.cc

+++ b/ash/shelf/shelf_view.cc

@@ -623,8 +623,9 @@ bool ShelfView::StartDrag(const std::string& app_id,

gfx::Point point_in_root = location_in_screen_coordinates;

::wm::ConvertPointFromScreen(

ash::wm::GetRootWindowAt(location_in_screen_coordinates), &point_in_root);

- ui::MouseEvent event(ui::ET_MOUSE_PRESSED, pt, point_in_root,

- ui::EventTimeForNow(), 0, 0);

+ ui::MouseEvent event(

+ ui::ET_MOUSE_PRESSED, pt, point_in_root, ui::EventTimeForNow(), 0, 0,

+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));

PointerPressedOnButton(drag_and_drop_view,

ShelfButtonHost::DRAG_AND_DROP,

event);

@@ -646,8 +647,9 @@ bool ShelfView::Drag(const gfx::Point& location_in_screen_coordinates) {

gfx::Point point_in_root = location_in_screen_coordinates;

::wm::ConvertPointFromScreen(

ash::wm::GetRootWindowAt(location_in_screen_coordinates), &point_in_root);

- ui::MouseEvent event(ui::ET_MOUSE_DRAGGED, pt, point_in_root,

- ui::EventTimeForNow(), 0, 0);

+ ui::MouseEvent event(

+ ui::ET_MOUSE_DRAGGED, pt, point_in_root, ui::EventTimeForNow(), 0, 0,

+ ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));

PointerDraggedOnButton(drag_and_drop_view,

ShelfButtonHost::DRAG_AND_DROP,

event);

« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | ui/events/event.h » ('J')