| 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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 void WebContentsViewAura::OnDeviceScaleFactorChanged( | 556 void WebContentsViewAura::OnDeviceScaleFactorChanged( |
| 557 float device_scale_factor) { | 557 float device_scale_factor) { |
| 558 } | 558 } |
| 559 | 559 |
| 560 void WebContentsViewAura::OnWindowDestroying() { | 560 void WebContentsViewAura::OnWindowDestroying() { |
| 561 } | 561 } |
| 562 | 562 |
| 563 void WebContentsViewAura::OnWindowDestroyed() { | 563 void WebContentsViewAura::OnWindowDestroyed() { |
| 564 } | 564 } |
| 565 | 565 |
| 566 void WebContentsViewAura::OnWindowVisibilityChanged(bool visible) { | 566 void WebContentsViewAura::OnWindowTargetVisibilityChanged(bool visible) { |
| 567 if (visible) | 567 if (visible) |
| 568 web_contents_->WasRestored(); | 568 web_contents_->WasRestored(); |
| 569 else | 569 else |
| 570 web_contents_->WasHidden(); | 570 web_contents_->WasHidden(); |
| 571 } | 571 } |
| 572 | 572 |
| 573 bool WebContentsViewAura::HasHitTestMask() const { | 573 bool WebContentsViewAura::HasHitTestMask() const { |
| 574 return false; | 574 return false; |
| 575 } | 575 } |
| 576 | 576 |
| (...skipping 58 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 |