OLD | NEW |
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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
586 case ui::ET_MOUSE_MOVED: | 586 case ui::ET_MOUSE_MOVED: |
587 web_contents_->GetDelegate()->ContentsMouseEvent( | 587 web_contents_->GetDelegate()->ContentsMouseEvent( |
588 web_contents_, gfx::Screen::GetCursorScreenPoint(), true); | 588 web_contents_, gfx::Screen::GetCursorScreenPoint(), true); |
589 break; | 589 break; |
590 default: | 590 default: |
591 break; | 591 break; |
592 } | 592 } |
593 return ui::ER_UNHANDLED; | 593 return ui::ER_UNHANDLED; |
594 } | 594 } |
595 | 595 |
596 ui::TouchStatus WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) { | 596 ui::EventResult WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) { |
597 return ui::TOUCH_STATUS_UNKNOWN; | 597 return ui::ER_UNHANDLED; |
598 } | 598 } |
599 | 599 |
600 ui::EventResult WebContentsViewAura::OnGestureEvent( | 600 ui::EventResult WebContentsViewAura::OnGestureEvent( |
601 ui::GestureEvent* event) { | 601 ui::GestureEvent* event) { |
602 return ui::ER_UNHANDLED; | 602 return ui::ER_UNHANDLED; |
603 } | 603 } |
604 | 604 |
605 //////////////////////////////////////////////////////////////////////////////// | 605 //////////////////////////////////////////////////////////////////////////////// |
606 // WebContentsViewAura, aura::client::DragDropDelegate implementation: | 606 // WebContentsViewAura, aura::client::DragDropDelegate implementation: |
607 | 607 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 OnDragEntered(event); | 658 OnDragEntered(event); |
659 | 659 |
660 web_contents_->GetRenderViewHost()->DragTargetDrop( | 660 web_contents_->GetRenderViewHost()->DragTargetDrop( |
661 event.location(), | 661 event.location(), |
662 gfx::Screen::GetCursorScreenPoint(), | 662 gfx::Screen::GetCursorScreenPoint(), |
663 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 663 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
664 if (drag_dest_delegate_) | 664 if (drag_dest_delegate_) |
665 drag_dest_delegate_->OnDrop(); | 665 drag_dest_delegate_->OnDrop(); |
666 return current_drag_op_; | 666 return current_drag_op_; |
667 } | 667 } |
OLD | NEW |