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

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

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/app_list/app_list_item_view.h » ('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/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/browser/renderer_host/dip_util.h" 9 #include "content/browser/renderer_host/dip_util.h"
10 #include "content/browser/renderer_host/overscroll_controller.h" 10 #include "content/browser/renderer_host/overscroll_controller.h"
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 web_contents_, 916 web_contents_,
917 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 917 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
918 true); 918 true);
919 break; 919 break;
920 default: 920 default:
921 break; 921 break;
922 } 922 }
923 return ui::ER_UNHANDLED; 923 return ui::ER_UNHANDLED;
924 } 924 }
925 925
926 ui::EventResult WebContentsViewAura::OnTouchEvent(ui::TouchEvent* event) {
927 return ui::ER_UNHANDLED;
928 }
929
930 ui::EventResult WebContentsViewAura::OnGestureEvent(
931 ui::GestureEvent* event) {
932 return ui::ER_UNHANDLED;
933 }
934
935 //////////////////////////////////////////////////////////////////////////////// 926 ////////////////////////////////////////////////////////////////////////////////
936 // WebContentsViewAura, aura::client::DragDropDelegate implementation: 927 // WebContentsViewAura, aura::client::DragDropDelegate implementation:
937 928
938 void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) { 929 void WebContentsViewAura::OnDragEntered(const ui::DropTargetEvent& event) {
939 if (drag_dest_delegate_) 930 if (drag_dest_delegate_)
940 drag_dest_delegate_->DragInitialize(web_contents_); 931 drag_dest_delegate_->DragInitialize(web_contents_);
941 932
942 current_drop_data_.reset(new WebDropData()); 933 current_drop_data_.reset(new WebDropData());
943 934
944 PrepareWebDropData(current_drop_data_.get(), event.data()); 935 PrepareWebDropData(current_drop_data_.get(), event.data());
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 event.location(), 987 event.location(),
997 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), 988 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
998 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); 989 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
999 if (drag_dest_delegate_) 990 if (drag_dest_delegate_)
1000 drag_dest_delegate_->OnDrop(); 991 drag_dest_delegate_->OnDrop();
1001 current_drop_data_.reset(); 992 current_drop_data_.reset();
1002 return current_drag_op_; 993 return current_drag_op_;
1003 } 994 }
1004 995
1005 } // namespace content 996 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.h ('k') | ui/app_list/app_list_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698