| Index: trunk/src/chrome/browser/guest_view/guest_view_base.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/guest_view/guest_view_base.cc (revision 287745)
|
| +++ trunk/src/chrome/browser/guest_view/guest_view_base.cc (working copy)
|
| @@ -93,7 +93,6 @@
|
| guest_instance_id_(guest_instance_id),
|
| view_instance_id_(guestview::kInstanceIDNone),
|
| initialized_(false),
|
| - auto_size_enabled_(false),
|
| weak_ptr_factory_(this) {
|
| }
|
|
|
| @@ -144,34 +143,6 @@
|
| DidInitialize();
|
| }
|
|
|
| -void GuestViewBase::SetAutoSize(bool enabled,
|
| - const gfx::Size& min_size,
|
| - const gfx::Size& max_size) {
|
| - min_auto_size_ = min_size;
|
| - min_auto_size_.SetToMin(max_size);
|
| - max_auto_size_ = max_size;
|
| - max_auto_size_.SetToMax(min_size);
|
| -
|
| - enabled &= !!max_auto_size_.width() && !!max_auto_size_.height() &&
|
| - IsAutoSizeSupported();
|
| - if (!enabled && !auto_size_enabled_)
|
| - return;
|
| -
|
| - auto_size_enabled_ = enabled;
|
| -
|
| - if (!attached())
|
| - return;
|
| -
|
| - content::RenderViewHost* rvh = guest_web_contents()->GetRenderViewHost();
|
| - if (auto_size_enabled_) {
|
| - rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
|
| - } else {
|
| - rvh->DisableAutoResize(element_size_);
|
| - guest_size_ = element_size_;
|
| - GuestSizeChangedDueToAutoSize(guest_size_, element_size_);
|
| - }
|
| -}
|
| -
|
| // static
|
| void GuestViewBase::RegisterGuestViewType(
|
| const std::string& view_type,
|
| @@ -251,10 +222,6 @@
|
| return weak_ptr_factory_.GetWeakPtr();
|
| }
|
|
|
| -bool GuestViewBase::IsAutoSizeSupported() const {
|
| - return false;
|
| -}
|
| -
|
| bool GuestViewBase::IsDragAndDropEnabled() const {
|
| return false;
|
| }
|
| @@ -301,23 +268,10 @@
|
| SendQueuedEvents();
|
| }
|
|
|
| -void GuestViewBase::ElementSizeChanged(const gfx::Size& old_size,
|
| - const gfx::Size& new_size) {
|
| - element_size_ = new_size;
|
| -}
|
| -
|
| int GuestViewBase::GetGuestInstanceID() const {
|
| return guest_instance_id_;
|
| }
|
|
|
| -void GuestViewBase::GuestSizeChanged(const gfx::Size& old_size,
|
| - const gfx::Size& new_size) {
|
| - if (!auto_size_enabled_)
|
| - return;
|
| - guest_size_ = new_size;
|
| - GuestSizeChangedDueToAutoSize(old_size, new_size);
|
| -}
|
| -
|
| void GuestViewBase::SetOpener(GuestViewBase* guest) {
|
| if (guest && guest->IsViewType(GetViewType())) {
|
| opener_ = guest->AsWeakPtr();
|
| @@ -357,16 +311,6 @@
|
| DidStopLoading();
|
| }
|
|
|
| -void GuestViewBase::RenderViewReady() {
|
| - GuestReady();
|
| - content::RenderViewHost* rvh = guest_web_contents()->GetRenderViewHost();
|
| - if (auto_size_enabled_) {
|
| - rvh->EnableAutoResize(min_auto_size_, max_auto_size_);
|
| - } else {
|
| - rvh->DisableAutoResize(element_size_);
|
| - }
|
| -}
|
| -
|
| void GuestViewBase::WebContentsDestroyed() {
|
| GuestDestroyed();
|
| delete this;
|
|
|