summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Dixon <joth@google.com>2013-09-20 23:39:25 +0000
committerJonathan Dixon <joth@google.com>2013-09-20 23:39:25 +0000
commit36cab4579d7633fa3bc89bd550a01cc0e39fb163 (patch)
tree6104ea3ed68e5b72f66307e8c1a83c1fdd2d1f66
parentd9e4aedf3d14b3494d54dbb482ece3603d0f693d (diff)
downloadwebview-36cab4579d7633fa3bc89bd550a01cc0e39fb163.tar.gz
Revert "Implement the new WebView.setWebContentsDebuggingEnabled API"
chromium_org this relies on is reverted so this must be too. This reverts commit d9e4aedf3d14b3494d54dbb482ece3603d0f693d. Change-Id: I260c806028eb5368cb639876a727ce710e9b4f2b
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java28
1 files changed, 0 insertions, 28 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index 6a24db9..e7bfb5a 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -34,7 +34,6 @@ import org.chromium.android_webview.AwBrowserContext;
import org.chromium.android_webview.AwBrowserProcess;
import org.chromium.android_webview.AwContents;
import org.chromium.android_webview.AwCookieManager;
-import org.chromium.android_webview.AwDevToolsServer;
import org.chromium.android_webview.AwFormDatabase;
import org.chromium.android_webview.AwGeolocationPermissions;
import org.chromium.android_webview.AwQuotaManagerBridge;
@@ -64,7 +63,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
private WebIconDatabaseAdapter mWebIconDatabase;
private WebStorageAdapter mWebStorage;
private WebViewDatabaseAdapter mWebViewDatabase;
- private AwDevToolsServer mDevToolsServer;
// Read/write protected by mLock.
private boolean mStarted;
@@ -164,11 +162,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
AwBrowserProcess.start(ActivityThread.currentApplication());
initPlatSupportLibrary();
-
- if (Build.IS_DEBUGGABLE) {
- setWebContentsDebuggingEnabled(true);
- }
-
mStarted = true;
}
@@ -195,15 +188,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
public String getDefaultUserAgent(Context context) {
return AwSettings.getDefaultUserAgent();
}
-
- @Override
- public void setWebContentsDebuggingEnabled(boolean enable) {
- // Web Contents debugging is always enabled on debug builds.
- if (!Build.IS_DEBUGGABLE) {
- WebViewChromiumFactoryProvider.this.
- setWebContentsDebuggingEnabled(enable);
- }
- }
};
}
}
@@ -293,16 +277,4 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
return mWebViewDatabase;
}
-
- private void setWebContentsDebuggingEnabled(boolean enable) {
- if (Looper.myLooper() != Looper.getMainLooper()) {
- throw new RuntimeException(
- "Toggling of Web Contents Debugging must be done on the main thread");
- }
- if (mDevToolsServer == null) {
- if (!enable) return;
- mDevToolsServer = new AwDevToolsServer();
- }
- mDevToolsServer.setRemoteDebuggingEnabled(enable);
- }
}