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

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

Issue 301733006: Zoom Extension API (chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update to match changes in content/ CL. Created 6 years, 6 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 7b8e4f4995b962de8645191ad74249f3fc57163b..39e3aacf49808cd2237b3bb9692dc3ef8285c9ea 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
#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/zoom/zoom_controller.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/render_messages.h"
#include "content/public/browser/browser_thread.h"
@@ -878,7 +879,7 @@ void WebViewGuest::DidCommitProvisionalLoadForFrame(
// Update the current zoom factor for the new page.
current_zoom_factor_ = content::ZoomLevelToZoomFactor(
- content::HostZoomMap::GetZoomLevel(guest_web_contents()));
+ ZoomController::FromWebContents(guest_web_contents())->GetZoomLevel());
if (is_main_frame) {
chromevox_injected_ = false;
@@ -1325,8 +1326,11 @@ void WebViewGuest::SetName(const std::string& name) {
}
void WebViewGuest::SetZoom(double zoom_factor) {
+ ZoomController* zoom_controller =
+ ZoomController::FromWebContents(guest_web_contents());
double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
- content::HostZoomMap::SetZoomLevel(guest_web_contents(), zoom_level);
+ // TODO(wjmaclean) Should we talk to HostZoomMap directly instead?
Fady Samuel 2014/06/12 19:38:58 I don't think so. WebViews should always be in iso
wjmaclean 2014/06/12 19:42:22 Sorry about this ... this comment died (in my mind
+ zoom_controller->SetZoomLevel(zoom_level);
scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);

Powered by Google App Engine
This is Rietveld 408576698