| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/guest_view/guest_view_base.h" | 5 #include "extensions/browser/guest_view/guest_view_base.h" |
| 6 | 6 |
| 7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "components/ui/zoom/page_zoom.h" | 9 #include "components/ui/zoom/page_zoom.h" |
| 10 #include "components/ui/zoom/zoom_controller.h" | 10 #include "components/ui/zoom/zoom_controller.h" |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 | 285 |
| 286 if (auto_size_enabled_) { | 286 if (auto_size_enabled_) { |
| 287 // Autosize was previously enabled. | 287 // Autosize was previously enabled. |
| 288 rvh->DisableAutoResize(new_size); | 288 rvh->DisableAutoResize(new_size); |
| 289 GuestSizeChangedDueToAutoSize(guest_size_, new_size); | 289 GuestSizeChangedDueToAutoSize(guest_size_, new_size); |
| 290 } else { | 290 } else { |
| 291 // Autosize was already disabled. | 291 // Autosize was already disabled. |
| 292 guest_sizer_->SizeContents(new_size); | 292 guest_sizer_->SizeContents(new_size); |
| 293 } | 293 } |
| 294 | 294 |
| 295 DispatchOnResizeEvent(guest_size_, new_size); |
| 295 guest_size_ = new_size; | 296 guest_size_ = new_size; |
| 296 } | 297 } |
| 297 | 298 |
| 298 auto_size_enabled_ = enable_auto_size; | 299 auto_size_enabled_ = enable_auto_size; |
| 299 } | 300 } |
| 300 | 301 |
| 301 // static | 302 // static |
| 302 void GuestViewBase::RegisterGuestViewType( | 303 void GuestViewBase::RegisterGuestViewType( |
| 303 const std::string& view_type, | 304 const std::string& view_type, |
| 304 const GuestCreationCallback& callback) { | 305 const GuestCreationCallback& callback) { |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 element_instance_id_)); | 401 element_instance_id_)); |
| 401 element_instance_id_ = guestview::kInstanceIDNone; | 402 element_instance_id_ = guestview::kInstanceIDNone; |
| 402 } | 403 } |
| 403 | 404 |
| 404 void GuestViewBase::ElementSizeChanged(const gfx::Size& size) { | 405 void GuestViewBase::ElementSizeChanged(const gfx::Size& size) { |
| 405 if (size.IsEmpty()) | 406 if (size.IsEmpty()) |
| 406 return; | 407 return; |
| 407 | 408 |
| 408 // Only resize if needed. | 409 // Only resize if needed. |
| 409 guest_sizer_->SizeContents(size); | 410 guest_sizer_->SizeContents(size); |
| 411 DispatchOnResizeEvent(guest_size_, size); |
| 410 guest_size_ = size; | 412 guest_size_ = size; |
| 411 } | 413 } |
| 412 | 414 |
| 413 WebContents* GuestViewBase::GetOwnerWebContents() const { | 415 WebContents* GuestViewBase::GetOwnerWebContents() const { |
| 414 return owner_web_contents_; | 416 return owner_web_contents_; |
| 415 } | 417 } |
| 416 | 418 |
| 417 void GuestViewBase::GuestSizeChanged(const gfx::Size& old_size, | 419 void GuestViewBase::GuestSizeChanged(const gfx::Size& new_size) { |
| 418 const gfx::Size& new_size) { | |
| 419 DispatchOnResizeEvent(old_size, new_size); | |
| 420 | |
| 421 if (!auto_size_enabled_) | 420 if (!auto_size_enabled_) |
| 422 return; | 421 return; |
| 422 GuestSizeChangedDueToAutoSize(guest_size_, new_size); |
| 423 DispatchOnResizeEvent(guest_size_, new_size); |
| 423 guest_size_ = new_size; | 424 guest_size_ = new_size; |
| 424 GuestSizeChangedDueToAutoSize(old_size, new_size); | |
| 425 } | 425 } |
| 426 | 426 |
| 427 const GURL& GuestViewBase::GetOwnerSiteURL() const { | 427 const GURL& GuestViewBase::GetOwnerSiteURL() const { |
| 428 return owner_web_contents()->GetLastCommittedURL(); | 428 return owner_web_contents()->GetLastCommittedURL(); |
| 429 } | 429 } |
| 430 | 430 |
| 431 void GuestViewBase::Destroy() { | 431 void GuestViewBase::Destroy() { |
| 432 if (is_being_destroyed_) | 432 if (is_being_destroyed_) |
| 433 return; | 433 return; |
| 434 | 434 |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 742 // static | 742 // static |
| 743 void GuestViewBase::RegisterGuestViewTypes() { | 743 void GuestViewBase::RegisterGuestViewTypes() { |
| 744 AppViewGuest::Register(); | 744 AppViewGuest::Register(); |
| 745 ExtensionOptionsGuest::Register(); | 745 ExtensionOptionsGuest::Register(); |
| 746 MimeHandlerViewGuest::Register(); | 746 MimeHandlerViewGuest::Register(); |
| 747 SurfaceWorkerGuest::Register(); | 747 SurfaceWorkerGuest::Register(); |
| 748 WebViewGuest::Register(); | 748 WebViewGuest::Register(); |
| 749 } | 749 } |
| 750 | 750 |
| 751 } // namespace extensions | 751 } // namespace extensions |
| OLD | NEW |