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

Side by Side Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 10964051: events: Clean up dispatching code for touch-events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('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/web_contents/web_contents_view_aura.h" 5 #include "content/browser/web_contents/web_contents_view_aura.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "content/browser/renderer_host/dip_util.h" 8 #include "content/browser/renderer_host/dip_util.h"
9 #include "content/browser/renderer_host/render_view_host_factory.h" 9 #include "content/browser/renderer_host/render_view_host_factory.h"
10 #include "content/browser/web_contents/interstitial_page_impl.h" 10 #include "content/browser/web_contents/interstitial_page_impl.h"
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 case ui::ET_MOUSE_MOVED: 587 case ui::ET_MOUSE_MOVED:
588 web_contents_->GetDelegate()->ContentsMouseEvent( 588 web_contents_->GetDelegate()->ContentsMouseEvent(
589 web_contents_, gfx::Screen::GetCursorScreenPoint(), true); 589 web_contents_, gfx::Screen::GetCursorScreenPoint(), true);
590 break; 590 break;
591 default: 591 default:
592 break; 592 break;
593 } 593 }
594 return ui::ER_UNHANDLED; 594 return ui::ER_UNHANDLED;
595 } 595 }
596 596
597 ui::TouchStatus WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) { 597 ui::EventResult WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) {
598 return ui::TOUCH_STATUS_UNKNOWN; 598 return ui::ER_UNHANDLED;
599 } 599 }
600 600
601 ui::EventResult WebContentsViewAura::OnGestureEvent( 601 ui::EventResult WebContentsViewAura::OnGestureEvent(
602 ui::GestureEvent* event) { 602 ui::GestureEvent* event) {
603 return ui::ER_UNHANDLED; 603 return ui::ER_UNHANDLED;
604 } 604 }
605 605
606 //////////////////////////////////////////////////////////////////////////////// 606 ////////////////////////////////////////////////////////////////////////////////
607 // WebContentsViewAura, aura::client::DragDropDelegate implementation: 607 // WebContentsViewAura, aura::client::DragDropDelegate implementation:
608 608
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 OnDragEntered(event); 659 OnDragEntered(event);
660 660
661 web_contents_->GetRenderViewHost()->DragTargetDrop( 661 web_contents_->GetRenderViewHost()->DragTargetDrop(
662 event.location(), 662 event.location(),
663 gfx::Screen::GetCursorScreenPoint(), 663 gfx::Screen::GetCursorScreenPoint(),
664 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 664 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
665 if (drag_dest_delegate_) 665 if (drag_dest_delegate_)
666 drag_dest_delegate_->OnDrop(); 666 drag_dest_delegate_->OnDrop();
667 return current_drag_op_; 667 return current_drag_op_;
668 } 668 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698