| 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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 return gfx::Size(); | 483 return gfx::Size(); |
| 484 } | 484 } |
| 485 | 485 |
| 486 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 486 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
| 487 const gfx::Rect& new_bounds) { | 487 const gfx::Rect& new_bounds) { |
| 488 SizeChangedCommon(new_bounds.size()); | 488 SizeChangedCommon(new_bounds.size()); |
| 489 if (delegate_.get()) | 489 if (delegate_.get()) |
| 490 delegate_->SizeChanged(new_bounds.size()); | 490 delegate_->SizeChanged(new_bounds.size()); |
| 491 } | 491 } |
| 492 | 492 |
| 493 void WebContentsViewAura::OnFocus() { | 493 void WebContentsViewAura::OnFocus(aura::Window* old_focused_window) { |
| 494 } | 494 } |
| 495 | 495 |
| 496 void WebContentsViewAura::OnBlur() { | 496 void WebContentsViewAura::OnBlur() { |
| 497 } | 497 } |
| 498 | 498 |
| 499 bool WebContentsViewAura::OnKeyEvent(aura::KeyEvent* event) { | 499 bool WebContentsViewAura::OnKeyEvent(aura::KeyEvent* event) { |
| 500 return false; | 500 return false; |
| 501 } | 501 } |
| 502 | 502 |
| 503 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) { | 503 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) { |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 OnDragEntered(event); | 635 OnDragEntered(event); |
| 636 | 636 |
| 637 web_contents_->GetRenderViewHost()->DragTargetDrop( | 637 web_contents_->GetRenderViewHost()->DragTargetDrop( |
| 638 event.location(), | 638 event.location(), |
| 639 GetNativeView()->GetRootWindow()->last_mouse_location(), | 639 GetNativeView()->GetRootWindow()->last_mouse_location(), |
| 640 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 640 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
| 641 if (drag_dest_delegate_) | 641 if (drag_dest_delegate_) |
| 642 drag_dest_delegate_->OnDrop(); | 642 drag_dest_delegate_->OnDrop(); |
| 643 return current_drag_op_; | 643 return current_drag_op_; |
| 644 } | 644 } |
| OLD | NEW |