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/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 if (!window_) | 717 if (!window_) |
718 return; | 718 return; |
719 | 719 |
720 window_observer_.reset(); | 720 window_observer_.reset(); |
721 | 721 |
722 // Window needs a valid delegate during its destructor, so we explicitly | 722 // Window needs a valid delegate during its destructor, so we explicitly |
723 // delete it here. | 723 // delete it here. |
724 window_.reset(); | 724 window_.reset(); |
725 } | 725 } |
726 | 726 |
727 void WebContentsViewAura::SetupOverlayWindowForTesting() { | |
728 if (navigation_overlay_) | |
729 navigation_overlay_->SetupForTesting(); | |
730 } | |
731 | |
732 void WebContentsViewAura::SetTouchEditableForTest( | 727 void WebContentsViewAura::SetTouchEditableForTest( |
733 TouchEditableImplAura* touch_editable) { | 728 TouchEditableImplAura* touch_editable) { |
734 touch_editable_.reset(touch_editable); | 729 touch_editable_.reset(touch_editable); |
735 AttachTouchEditableToRenderView(); | 730 AttachTouchEditableToRenderView(); |
736 } | 731 } |
737 | 732 |
738 void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) { | 733 void WebContentsViewAura::SizeChangedCommon(const gfx::Size& size) { |
739 if (web_contents_->GetInterstitialPage()) | 734 if (web_contents_->GetInterstitialPage()) |
740 web_contents_->GetInterstitialPage()->SetSize(size); | 735 web_contents_->GetInterstitialPage()->SetSize(size); |
741 RenderWidgetHostView* rwhv = | 736 RenderWidgetHostView* rwhv = |
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1549 event.location(), | 1544 event.location(), |
1550 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), | 1545 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), |
1551 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 1546 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
1552 if (drag_dest_delegate_) | 1547 if (drag_dest_delegate_) |
1553 drag_dest_delegate_->OnDrop(); | 1548 drag_dest_delegate_->OnDrop(); |
1554 current_drop_data_.reset(); | 1549 current_drop_data_.reset(); |
1555 return ConvertFromWeb(current_drag_op_); | 1550 return ConvertFromWeb(current_drag_op_); |
1556 } | 1551 } |
1557 | 1552 |
1558 } // namespace content | 1553 } // namespace content |
OLD | NEW |