diff options
author | Gustav Sennton <gsennton@google.com> | 2018-02-15 01:17:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-15 01:17:29 +0000 |
commit | 9825ebf27f108b34e203a8ee3c72102df068de27 (patch) | |
tree | 5b1b5cf06affe674abc354076a7440346f2575c1 | |
parent | 6c54bf9d7407a3e9a3c66bfacf14e19777dcd931 (diff) | |
parent | 81a9af232c72d5fb9118e141ade713e56032e4cd (diff) | |
download | webview_support_interfaces-9825ebf27f108b34e203a8ee3c72102df068de27.tar.gz |
Rename boundary interfaces, and pass WebView to WVFP.createWebView. am: 32e305a583
am: 81a9af232c
Change-Id: I877d4407b97d565c41a0170a0e71020064cb67ad
-rw-r--r-- | BUILD.gn | 8 | ||||
-rw-r--r-- | src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java (renamed from src/org/chromium/support_lib_boundary/VisualStateCallbackInterface.java) | 4 | ||||
-rw-r--r-- | src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java (renamed from src/org/chromium/support_lib_boundary/WebSettingsInterface.java) | 4 | ||||
-rw-r--r-- | src/org/chromium/support_lib_boundary/WebViewProvider.java | 16 | ||||
-rw-r--r-- | src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java | 14 | ||||
-rw-r--r-- | src/org/chromium/support_lib_boundary/WebViewProviderFactory.java | 16 | ||||
-rw-r--r-- | src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java | 15 |
7 files changed, 37 insertions, 40 deletions
@@ -7,10 +7,10 @@ import("//build/config/android/rules.gni") android_library("boundary_interface_java") { java_files = [ - "src/org/chromium/support_lib_boundary/VisualStateCallbackInterface.java", - "src/org/chromium/support_lib_boundary/WebSettingsInterface.java", - "src/org/chromium/support_lib_boundary/WebViewProvider.java", - "src/org/chromium/support_lib_boundary/WebViewProviderFactory.java", + "src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java", + "src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java", + "src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java", + "src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java", ] # We can't use ANY deps here, the support library should be able to build diff --git a/src/org/chromium/support_lib_boundary/VisualStateCallbackInterface.java b/src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java index 1511191..6fd25c5 100644 --- a/src/org/chromium/support_lib_boundary/VisualStateCallbackInterface.java +++ b/src/org/chromium/support_lib_boundary/VisualStateCallbackBoundaryInterface.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,4 +6,4 @@ package org.chromium.support_lib_boundary; /** */ -public interface VisualStateCallbackInterface { void onComplete(long requestId); } +public interface VisualStateCallbackBoundaryInterface { void onComplete(long requestId); } diff --git a/src/org/chromium/support_lib_boundary/WebSettingsInterface.java b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java index c138afb..4ee8d6b 100644 --- a/src/org/chromium/support_lib_boundary/WebSettingsInterface.java +++ b/src/org/chromium/support_lib_boundary/WebSettingsBoundaryInterface.java @@ -1,4 +1,4 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. +// Copyright 2018 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,7 +10,7 @@ package org.chromium.support_lib_boundary; // against. /** */ -public interface WebSettingsInterface { +public interface WebSettingsBoundaryInterface { void setSafeBrowsingEnabled(boolean enabled); boolean getSafeBrowsingEnabled(); } diff --git a/src/org/chromium/support_lib_boundary/WebViewProvider.java b/src/org/chromium/support_lib_boundary/WebViewProvider.java deleted file mode 100644 index 977902d..0000000 --- a/src/org/chromium/support_lib_boundary/WebViewProvider.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package org.chromium.support_lib_boundary; - -import java.lang.reflect.InvocationHandler; - -/** - */ -public interface WebViewProvider { - void insertVisualStateCallback(long requestId, - InvocationHandler - /* org.chromium.sup_lib_boundary.VisualStateCallback */ callbackInvoHandler); - InvocationHandler /* org.chromium.sup_lib_boundary.WebSettingsInterface */ getSettings(); -} diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java new file mode 100644 index 0000000..52524ed --- /dev/null +++ b/src/org/chromium/support_lib_boundary/WebViewProviderBoundaryInterface.java @@ -0,0 +1,14 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.support_lib_boundary; + +import java.lang.reflect.InvocationHandler; + +/** + */ +public interface WebViewProviderBoundaryInterface { + void insertVisualStateCallback(long requestId, + /* VisualStateCallback */ InvocationHandler callback); +} diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderFactory.java b/src/org/chromium/support_lib_boundary/WebViewProviderFactory.java deleted file mode 100644 index 734e281..0000000 --- a/src/org/chromium/support_lib_boundary/WebViewProviderFactory.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package org.chromium.support_lib_boundary; - -import java.lang.reflect.InvocationHandler; - -/** - */ -public interface WebViewProviderFactory { - // android.webkit.WebViewProvider is in the SystemApi, not public, so we pass it as an Object - // here. - InvocationHandler /* org.chromium.sup_lib_boundary.WebViewProvider */ createWebView( - Object /* android.webkit.WebViewProvider */ webviewProvider); -} diff --git a/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java b/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java new file mode 100644 index 0000000..47ff918 --- /dev/null +++ b/src/org/chromium/support_lib_boundary/WebViewProviderFactoryBoundaryInterface.java @@ -0,0 +1,15 @@ +// Copyright 2018 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package org.chromium.support_lib_boundary; + +import android.webkit.WebView; + +import java.lang.reflect.InvocationHandler; + +/** + */ +public interface WebViewProviderFactoryBoundaryInterface { + /* SupportLibraryWebViewProvider */ InvocationHandler createWebView(WebView webview); +} |