| 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/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 890 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 scoped_refptr<ui::Texture> WebContentsViewAura::CopyTexture() { | 901 scoped_refptr<ui::Texture> WebContentsViewAura::CopyTexture() { |
| 902 // The layer we create doesn't have an external texture, so this should never | 902 // The layer we create doesn't have an external texture, so this should never |
| 903 // get invoked. | 903 // get invoked. |
| 904 NOTREACHED(); | 904 NOTREACHED(); |
| 905 return scoped_refptr<ui::Texture>(); | 905 return scoped_refptr<ui::Texture>(); |
| 906 } | 906 } |
| 907 | 907 |
| 908 //////////////////////////////////////////////////////////////////////////////// | 908 //////////////////////////////////////////////////////////////////////////////// |
| 909 // WebContentsViewAura, ui::EventHandler implementation: | 909 // WebContentsViewAura, ui::EventHandler implementation: |
| 910 | 910 |
| 911 ui::EventResult WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) { | 911 void WebContentsViewAura::OnKeyEvent(ui::KeyEvent* event) { |
| 912 return ui::ER_UNHANDLED; | |
| 913 } | 912 } |
| 914 | 913 |
| 915 ui::EventResult WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) { | 914 ui::EventResult WebContentsViewAura::OnMouseEvent(ui::MouseEvent* event) { |
| 916 if (!web_contents_->GetDelegate()) | 915 if (!web_contents_->GetDelegate()) |
| 917 return ui::ER_UNHANDLED; | 916 return ui::ER_UNHANDLED; |
| 918 | 917 |
| 919 switch (event->type()) { | 918 switch (event->type()) { |
| 920 case ui::ET_MOUSE_PRESSED: | 919 case ui::ET_MOUSE_PRESSED: |
| 921 web_contents_->GetDelegate()->ActivateContents(web_contents_); | 920 web_contents_->GetDelegate()->ActivateContents(web_contents_); |
| 922 break; | 921 break; |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 996 event.location(), | 995 event.location(), |
| 997 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), | 996 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), |
| 998 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 997 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
| 999 if (drag_dest_delegate_) | 998 if (drag_dest_delegate_) |
| 1000 drag_dest_delegate_->OnDrop(); | 999 drag_dest_delegate_->OnDrop(); |
| 1001 current_drop_data_.reset(); | 1000 current_drop_data_.reset(); |
| 1002 return current_drag_op_; | 1001 return current_drag_op_; |
| 1003 } | 1002 } |
| 1004 | 1003 |
| 1005 } // namespace content | 1004 } // namespace content |
| OLD | NEW |