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 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
790 overscroll_window_.reset(); | 790 overscroll_window_.reset(); |
791 } | 791 } |
792 | 792 |
793 //////////////////////////////////////////////////////////////////////////////// | 793 //////////////////////////////////////////////////////////////////////////////// |
794 // WebContentsViewAura, aura::WindowDelegate implementation: | 794 // WebContentsViewAura, aura::WindowDelegate implementation: |
795 | 795 |
796 gfx::Size WebContentsViewAura::GetMinimumSize() const { | 796 gfx::Size WebContentsViewAura::GetMinimumSize() const { |
797 return gfx::Size(); | 797 return gfx::Size(); |
798 } | 798 } |
799 | 799 |
| 800 gfx::Size WebContentsViewAura::GetMaximumSize() const { |
| 801 return gfx::Size(); |
| 802 } |
| 803 |
800 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, | 804 void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds, |
801 const gfx::Rect& new_bounds) { | 805 const gfx::Rect& new_bounds) { |
802 SizeChangedCommon(new_bounds.size()); | 806 SizeChangedCommon(new_bounds.size()); |
803 if (delegate_.get()) | 807 if (delegate_.get()) |
804 delegate_->SizeChanged(new_bounds.size()); | 808 delegate_->SizeChanged(new_bounds.size()); |
805 | 809 |
806 // Constrained web dialogs, need to be kept centered over our content area. | 810 // Constrained web dialogs, need to be kept centered over our content area. |
807 for (size_t i = 0; i < window_->children().size(); i++) { | 811 for (size_t i = 0; i < window_->children().size(); i++) { |
808 if (window_->children()[i]->GetProperty( | 812 if (window_->children()[i]->GetProperty( |
809 aura::client::kConstrainedWindowKey)) { | 813 aura::client::kConstrainedWindowKey)) { |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
985 event.location(), | 989 event.location(), |
986 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), | 990 gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(), |
987 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); | 991 ConvertAuraEventFlagsToWebInputEventModifiers(event.flags())); |
988 if (drag_dest_delegate_) | 992 if (drag_dest_delegate_) |
989 drag_dest_delegate_->OnDrop(); | 993 drag_dest_delegate_->OnDrop(); |
990 current_drop_data_.reset(); | 994 current_drop_data_.reset(); |
991 return current_drag_op_; | 995 return current_drag_op_; |
992 } | 996 } |
993 | 997 |
994 } // namespace content | 998 } // namespace content |
OLD | NEW |