Index: chrome/browser/guest_view/web_view/web_view_guest.cc |
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc |
index 9337d4150676773cb5b457c57347145c536cdb78..3fd65aff7188e924d8fa09d9a52848515e065c19 100644 |
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc |
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc |
@@ -25,11 +25,11 @@ |
#include "chrome/browser/renderer_context_menu/context_menu_delegate.h" |
#include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
#include "chrome/browser/ui/pdf/pdf_tab_helper.h" |
+#include "chrome/browser/ui/zoom/zoom_controller.h" |
#include "chrome/common/chrome_version_info.h" |
#include "chrome/common/render_messages.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/child_process_security_policy.h" |
-#include "content/public/browser/host_zoom_map.h" |
#include "content/public/browser/native_web_keyboard_event.h" |
#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/notification_details.h" |
@@ -971,8 +971,10 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame( |
new GuestViewBase::Event(webview::kEventLoadCommit, args.Pass())); |
// Update the current zoom factor for the new page. |
- current_zoom_factor_ = content::ZoomLevelToZoomFactor( |
- content::HostZoomMap::GetZoomLevel(guest_web_contents())); |
+ ZoomController* zoom_controller = |
+ ZoomController::FromWebContents(guest_web_contents()); |
+ DCHECK(zoom_controller); |
+ current_zoom_factor_ = zoom_controller->GetZoomLevel(); |
if (is_main_frame) { |
chromevox_injected_ = false; |
@@ -1422,8 +1424,11 @@ void WebViewGuest::SetName(const std::string& name) { |
} |
void WebViewGuest::SetZoom(double zoom_factor) { |
+ ZoomController* zoom_controller = |
+ ZoomController::FromWebContents(guest_web_contents()); |
+ DCHECK(zoom_controller); |
double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor); |
- content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level); |
+ zoom_controller->SetZoomLevel(zoom_level); |
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue()); |
args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_); |