Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(922)

Unified Diff: chrome/browser/guest_view/web_view/web_view_guest.cc

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revised as per comments. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9f9ea466b834bb7667ae8d76cd3b6dcf6b5638ab..1ed25dea209a48864c7d10204bba93c15251b7ae 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -27,6 +27,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/geolocation_permission_context.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"
@@ -578,7 +579,7 @@ void WebViewGuest::Observe(int type,
void WebViewGuest::SetZoom(double zoom_factor) {
double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
- guest_web_contents()->SetZoomLevel(zoom_level);
+ content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level);
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
@@ -813,7 +814,7 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame(
// Update the current zoom factor for the new page.
current_zoom_factor_ = content::ZoomLevelToZoomFactor(
- guest_web_contents()->GetZoomLevel());
+ content::HostZoomMap::GetZoomLevel(guest_web_contents()));
if (is_main_frame) {
chromevox_injected_ = false;

Powered by Google App Engine
This is Rietveld 408576698