Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index 68726c4e35bd82268d52207cbb4e22ff821fdd82..f2713d48077056f70b399d1ac4718c7239eb59c6 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -83,6 +83,7 @@ |
#include "chrome/browser/ui/sync/sync_promo_ui.h" |
#include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
+#include "chrome/browser/ui/zoom/zoom_controller.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
@@ -850,6 +851,7 @@ void ChromeContentBrowserClient::GuestWebContentsCreated( |
NOTREACHED(); |
return; |
} |
+ |
wjmaclean
2014/06/23 18:40:48
Oops, I'll remove this line.
|
GURL guest_site_url = guest_site_instance->GetSiteURL(); |
const std::string& extension_id = guest_site_url.host(); |
@@ -871,6 +873,13 @@ void ChromeContentBrowserClient::GuestWebContentsCreated( |
return; |
} |
+ // Create a zoom controller for the guest contents give it access to |
+ // GetZoomLevel() and and SetZoomLevel() in WebViewGuest. |
+ // TODO(wjmaclean) This currently uses the same HostZoomMap as the browser |
+ // context, but we eventually want to isolate the guest contents from zoom |
+ // changes outside the guest (e.g. in the main browser), so we should |
+ // create a separate HostZoomMap for the guest. |
+ ZoomController::CreateForWebContents(guest_web_contents); |
if (opener_web_contents) { |
GuestViewBase* guest = GuestViewBase::FromWebContents(opener_web_contents); |
DCHECK(guest); |