commit e497b03334a877ad60cb0d82578287fea11be46d
author Martin Kosiba <mkosiba@google.com> Thu Aug 14 18:12:33 2014 +0100
committer Martin Kosiba <mkosiba@google.com> Thu Aug 14 18:12:33 2014 +0100
tree 8475ee97e194a00d829ff83b484dc0e1cd61b988
parent bb890910abf889a84662365821bfcfa699e917f4

Finish zoomBy API hookup.

BUG: 13399510

chromium/java/com/android/webview/chromium/WebViewChromium.java

diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index b593f1f..b0167b1 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -1462,15 +1462,12 @@
         return mAwContents.zoomOut();
     }
 
-    //TODO: remove once frameworks/base is updated
-    //@Override
+    @Override
     public boolean zoomBy(float factor) {
         mFactory.startYourEngines(true);
         // This is an L API and therefore we can enforce stricter threading constraints.
         checkThread();
-        //TODO: remove once Chromium-side CL is merged.
-        //return mAwContents.zoomBy(factor);
-        return false;
+        return mAwContents.zoomBy(factor);
     }
 
     @Override