diff options
author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 15:10:05 +0000 |
---|---|---|
committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-25 15:10:05 +0000 |
commit | 693c1830f2ad5536bda5deb6fae6c6de57416011 (patch) | |
tree | bfdc1a5a8e820bf03780f2ce18f63cc0724b27ae /android_webview/test | |
parent | 3bcc4c1003e63f198cdcdcfc7b255b409b547a7b (diff) | |
download | chromium_src-693c1830f2ad5536bda5deb6fae6c6de57416011.zip chromium_src-693c1830f2ad5536bda5deb6fae6c6de57416011.tar.gz chromium_src-693c1830f2ad5536bda5deb6fae6c6de57416011.tar.bz2 |
[Android WebView] Move the most of WebSettings into AwSettings
Historically, WebSettings management is used to be in the ContentSettings class,
while only WebView actually needs it. Chrome for Android is only interested in
the value of the "JavaScript enabled" setting.
This change leaves zoom-related settings intact, as moving them will require
decoupling of the ZoomManager class from the ContentView* family of classes,
which deserves a separate change.
BUG=b/8296421
Review URL: https://chromiumcodereview.appspot.com/14271024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/test')
-rw-r--r-- | android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java index 783ade5..e2d6dcf 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/shell/AwShellActivity.java @@ -88,7 +88,7 @@ public class AwShellActivity extends Activity { testContainerView.initialize(new AwContents(browserContext, testContainerView, testContainerView.getInternalAccessDelegate(), awContentsClient, false)); - testContainerView.getContentViewCore().getContentSettings().setJavaScriptEnabled(true); + testContainerView.getAwContents().getSettings().setJavaScriptEnabled(true); return testContainerView; } |