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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
649 | 649 |
650 void GuestViewBase::UpdateTargetURL(content::WebContents* source, | 650 void GuestViewBase::UpdateTargetURL(content::WebContents* source, |
651 const GURL& url) { | 651 const GURL& url) { |
652 if (!attached() || !embedder_web_contents()->GetDelegate()) | 652 if (!attached() || !embedder_web_contents()->GetDelegate()) |
653 return; | 653 return; |
654 | 654 |
655 embedder_web_contents()->GetDelegate()->UpdateTargetURL( | 655 embedder_web_contents()->GetDelegate()->UpdateTargetURL( |
656 embedder_web_contents(), url); | 656 embedder_web_contents(), url); |
657 } | 657 } |
658 | 658 |
| 659 bool GuestViewBase::ShouldResumeRequestsForCreatedWindow() { |
| 660 return false; |
| 661 } |
| 662 |
659 GuestViewBase::~GuestViewBase() { | 663 GuestViewBase::~GuestViewBase() { |
660 } | 664 } |
661 | 665 |
662 void GuestViewBase::OnZoomChanged( | 666 void GuestViewBase::OnZoomChanged( |
663 const ui_zoom::ZoomController::ZoomChangedEventData& data) { | 667 const ui_zoom::ZoomController::ZoomChangedEventData& data) { |
664 if (data.web_contents == embedder_web_contents()) { | 668 if (data.web_contents == embedder_web_contents()) { |
665 // The embedder's zoom level has changed. | 669 // The embedder's zoom level has changed. |
666 auto guest_zoom_controller = | 670 auto guest_zoom_controller = |
667 ui_zoom::ZoomController::FromWebContents(web_contents()); | 671 ui_zoom::ZoomController::FromWebContents(web_contents()); |
668 if (content::ZoomValuesEqual(data.new_zoom_level, | 672 if (content::ZoomValuesEqual(data.new_zoom_level, |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
811 | 815 |
812 auto embedder_zoom_controller = | 816 auto embedder_zoom_controller = |
813 ui_zoom::ZoomController::FromWebContents(owner_web_contents()); | 817 ui_zoom::ZoomController::FromWebContents(owner_web_contents()); |
814 // Chrome Apps do not have a ZoomController. | 818 // Chrome Apps do not have a ZoomController. |
815 if (!embedder_zoom_controller) | 819 if (!embedder_zoom_controller) |
816 return; | 820 return; |
817 embedder_zoom_controller->RemoveObserver(this); | 821 embedder_zoom_controller->RemoveObserver(this); |
818 } | 822 } |
819 | 823 |
820 } // namespace extensions | 824 } // namespace extensions |
OLD | NEW |