summaryrefslogtreecommitdiffstats
path: root/android_webview/javatests
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 14:16:44 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-29 14:16:44 +0000
commita070ffd276f587a889c398b5db5e65e06507c41e (patch)
tree929ca96fba34253b5e5e0a00b303a93c3f58afc2 /android_webview/javatests
parent2e77cdbbeae4b20fc3c16c710aadb0a039eb278b (diff)
downloadchromium_src-a070ffd276f587a889c398b5db5e65e06507c41e.zip
chromium_src-a070ffd276f587a889c398b5db5e65e06507c41e.tar.gz
chromium_src-a070ffd276f587a889c398b5db5e65e06507c41e.tar.bz2
[Android WebView] Add missing zoom controls hiding
Missing a call to dismissZoomPicker on window detachment was causing WindowManager to throw an exception about leaked window BUG=153522 R=benm@chromium.org, bulach@chromium.org Review URL: https://codereview.chromium.org/14509013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/javatests')
-rw-r--r--android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
index e0da4d3..5634393 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewZoomTest.java
@@ -14,7 +14,6 @@ import android.view.ViewConfiguration;
import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.AwSettings;
import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.content.browser.ContentSettings;
import org.chromium.content.browser.ContentViewCore;
@@ -304,12 +303,8 @@ public class ContentViewZoomTest extends AwTestBase {
assertEquals(View.GONE, zoomControls.getVisibility());
}
- /**
- * @SmallTest
- * @Feature({"AndroidWebView"})
- * BUG 153523
- */
- @DisabledTest
+ @SmallTest
+ @Feature({"AndroidWebView"})
public void testZoomControlsOnOrientationChange() throws Throwable {
AwSettings webSettings = getAwSettingsOnUiThread(mAwContents);
webSettings.setUseWideViewPort(true);