From a441ab2a2de6290940ca8b8f776e25aa5297fc4a Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Wed, 7 Feb 2018 05:41:56 +0000 Subject: [PATCH] Move ContentViewCore to content_public ContentViewCore is a public interface being used by embedder, now relocatable to content_public. DEPS files are updated as well. Most of changes come from updates their import path accordingly. TBR=sky@chromium.org,mthiesse@chromium.org Bug: 807155 Change-Id: I0a564579e3b0e16b5210a7d0384896cbef231d23 Reviewed-on: https://chromium-review.googlesource.com/900884 Commit-Queue: Jinsuk Kim Reviewed-by: Bo Cr-Commit-Position: refs/heads/master@{#534922} --- android_webview/java/DEPS | 1 - .../src/org/chromium/android_webview/AwAutofillClient.java | 2 +- .../java/src/org/chromium/android_webview/AwContents.java | 2 +- .../chromium/android_webview/PopupTouchHandleDrawable.java | 2 +- android_webview/javatests/DEPS | 1 - .../android_webview/test/AwContentsClientFullScreenTest.java | 2 +- .../chromium/android_webview/test/ContentViewMiscTest.java | 2 +- .../android_webview/test/PlatformMediaCodecTest.java | 2 +- .../org/chromium/android_webview/test/VisualStateTest.java | 2 +- .../org/chromium/android_webview/test/WebViewWebVrTest.java | 2 +- android_webview/test/shell/DEPS | 1 - .../chromium/android_webview/test/AwTestContainerView.java | 2 +- chrome/android/java/DEPS | 1 - .../java/src/org/chromium/chrome/browser/ChromeActivity.java | 5 ++--- .../chrome/browser/compositor/CompositorViewHolder.java | 2 +- .../browser/compositor/bottombar/OverlayContentDelegate.java | 2 +- .../chrome/browser/compositor/bottombar/OverlayPanel.java | 2 +- .../browser/compositor/bottombar/OverlayPanelContent.java | 2 +- .../bottombar/OverlayPanelContentViewDelegate.java | 2 +- .../chrome/browser/compositor/layouts/LayoutManager.java | 2 +- .../chrome/browser/compositor/layouts/LayoutManagerHost.java | 2 +- .../layouts/eventfilter/OverlayPanelEventFilter.java | 2 +- .../chrome/browser/contextmenu/ContextMenuItemDelegate.java | 2 +- .../browser/contextualsearch/ContextualSearchManager.java | 2 +- .../ContextualSearchSelectionController.java | 2 +- .../chrome/browser/dom_distiller/ReaderModeManager.java | 2 +- .../chrome/browser/fullscreen/ChromeFullscreenManager.java | 2 +- .../chrome/browser/fullscreen/FullscreenHtmlApiHandler.java | 2 +- .../browser/infobar/PermissionUpdateInfoBarDelegate.java | 2 +- .../chrome/browser/modaldialog/TabModalPresenter.java | 2 +- .../java/src/org/chromium/chrome/browser/tab/Tab.java | 2 +- .../src/org/chromium/chrome/browser/tab/TabObserver.java | 2 +- .../chrome/browser/tab/TabWebContentsDelegateAndroid.java | 2 +- .../org/chromium/chrome/browser/tabmodel/TabModelUtils.java | 2 +- .../org/chromium/chrome/browser/vr_shell/VrShellImpl.java | 2 +- chrome/android/javatests/DEPS | 1 - .../org/chromium/chrome/browser/ContentViewFocusTest.java | 2 +- .../org/chromium/chrome/browser/FullscreenActivityTest.java | 2 +- .../src/org/chromium/chrome/browser/OSKOverscrollTest.java | 3 +-- .../org/chromium/chrome/browser/SelectFileDialogTest.java | 2 +- .../javatests/src/org/chromium/chrome/browser/TabsTest.java | 2 +- .../browser/autofill/AutofillKeyboardAccessoryTest.java | 2 +- .../chromium/chrome/browser/autofill/AutofillPopupTest.java | 2 +- .../browser/autofill/AutofillPopupWithKeyboardTest.java | 2 +- .../compositor/bottombar/OverlayPanelEventFilterTest.java | 2 +- .../chrome/browser/compositor/layouts/MockLayoutHost.java | 2 +- .../contextualsearch/ContextualSearchManagerTest.java | 2 +- .../chrome/browser/fullscreen/FullscreenManagerTest.java | 2 +- .../browser/input/SelectPopupOtherContentViewTest.java | 2 +- .../chrome/browser/payments/PaymentRequestTestRule.java | 2 +- .../org/chromium/chrome/browser/vr_shell/TestFramework.java | 2 +- .../chrome/browser/vr_shell/VrShellControllerInputTest.java | 2 +- .../chrome/browser/vr_shell/VrShellNavigationTest.java | 2 +- .../chrome/browser/vr_shell/VrShellNavigationTestWebXr.java | 2 +- .../chrome/browser/vr_shell/util/TransitionUtils.java | 2 +- .../chrome/browser/vr_shell/util/VrTransitionUtils.java | 2 +- .../chrome/browser/vr_shell/util/XrTransitionUtils.java | 2 +- chrome/android/sync_shell/javatests/DEPS | 1 - .../src/org/chromium/chrome/browser/sync/SyncTest.java | 2 +- .../chromium/chromecast/shell/CastWebContentsService.java | 2 +- .../chromecast/shell/CastWebContentsSurfaceHelper.java | 2 +- content/public/android/BUILD.gn | 2 +- .../src/org/chromium/content/browser/ContentVideoView.java | 1 + .../java/src/org/chromium/content/browser/ContentView.java | 2 +- .../org/chromium/content/browser/ContentViewCoreImpl.java | 3 ++- .../org/chromium/content/browser/ContentViewRenderView.java | 1 + .../chromium/content/browser/input/SelectPopupDialog.java | 2 +- .../chromium/content/browser/input/SelectPopupDropdown.java | 2 +- .../{content => content_public}/browser/ContentViewCore.java | 4 ++-- .../content/browser/ContentViewCoreSelectionTest.java | 1 + .../chromium/content/browser/ContentViewPopupZoomerTest.java | 1 + .../chromium/content/browser/ContentViewScrollingTest.java | 2 +- .../chromium/content/browser/GestureDetectorResetTest.java | 1 + .../src/org/chromium/content/browser/NavigationTest.java | 1 + .../src/org/chromium/content/browser/PopupZoomerTest.java | 1 + .../browser/accessibility/WebContentsAccessibilityTest.java | 2 +- .../chromium/content/browser/input/ImeActivityTestRule.java | 2 +- .../org/chromium/content/browser/input/SelectPopupTest.java | 2 +- .../content/browser/input/TextSuggestionMenuTest.java | 2 +- .../src/org/chromium/content/browser/test/util/DOMUtils.java | 2 +- .../browser/test/util/TestCallbackHelperContainer.java | 2 +- .../content/browser/test/util/TestContentViewCore.java | 4 ++-- .../android/java/src/org/chromium/content_shell/Shell.java | 2 +- .../java/src/org/chromium/content_shell/ShellManager.java | 2 +- .../content_shell_apk/ContentShellActivityTestRule.java | 2 +- .../chromium_linker_test_apk/ChromiumLinkerTestActivity.java | 2 +- .../org/chromium/content_shell_apk/ContentShellActivity.java | 2 +- 87 files changed, 85 insertions(+), 85 deletions(-) rename content/public/android/java/src/org/chromium/{content => content_public}/browser/ContentViewCore.java (99%) diff --git a/android_webview/java/DEPS b/android_webview/java/DEPS index 28f3fedf178fdf..0e84df9a8c57bc 100644 --- a/android_webview/java/DEPS +++ b/android_webview/java/DEPS @@ -15,7 +15,6 @@ include_rules = [ "!content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java", "!content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java", "!content/public/android/java/src/org/chromium/content/browser/ContentVideoViewEmbedder.java", - "!content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java", "!content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java", "!content/public/android/java/src/org/chromium/content/browser/PositionObserver.java", "!content/public/android/java/src/org/chromium/content/browser/ViewPositionObserver.java", diff --git a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java index 2e6346f925be26..6953c7084c197a 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java +++ b/android_webview/java/src/org/chromium/android_webview/AwAutofillClient.java @@ -14,7 +14,7 @@ import org.chromium.components.autofill.AutofillDelegate; import org.chromium.components.autofill.AutofillPopup; import org.chromium.components.autofill.AutofillSuggestion; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.DropdownItem; import org.chromium.ui.base.WindowAndroid; diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java index fcf32b4910bc3f..2ab21146a8178d 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwContents.java +++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java @@ -64,9 +64,9 @@ import org.chromium.components.navigation_interception.InterceptNavigationDelegate; import org.chromium.components.navigation_interception.NavigationParams; import org.chromium.content.browser.AppWebMessagePort; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewStatics; import org.chromium.content_public.browser.ChildProcessImportance; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.GestureListenerManager; import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.ImeAdapter; diff --git a/android_webview/java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java b/android_webview/java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java index 574c60be856318..30d83fc3180e6f 100644 --- a/android_webview/java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java +++ b/android_webview/java/src/org/chromium/android_webview/PopupTouchHandleDrawable.java @@ -23,10 +23,10 @@ import org.chromium.base.ObserverList; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.PositionObserver; import org.chromium.content.browser.ViewPositionObserver; import org.chromium.content.browser.selection.HandleViewResources; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.GestureListenerManager; import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.WebContents; diff --git a/android_webview/javatests/DEPS b/android_webview/javatests/DEPS index cbb105ad1197e3..6ee18871f3589e 100644 --- a/android_webview/javatests/DEPS +++ b/android_webview/javatests/DEPS @@ -11,7 +11,6 @@ include_rules = [ "+content/public/android/java/src/org/chromium/content_public", "!content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java", "!content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java", - "!content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java", "!content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java", "!content/public/android/java/src/org/chromium/content/common/ContentSwitches.java", diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java index a42afe8c80b21f..e0c990507cb869 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java @@ -24,11 +24,11 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.TouchCommon; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.util.concurrent.TimeoutException; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java index b0199eaaf53e61..0d7cb3671fef81 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/ContentViewMiscTest.java @@ -23,8 +23,8 @@ import org.chromium.base.ContextUtils; import org.chromium.base.test.util.AdvancedMockContext; import org.chromium.base.test.util.Feature; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewStatics; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.net.ProxyChangeListener; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java index 70f21d548d46b3..02080acd19801f 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/PlatformMediaCodecTest.java @@ -15,8 +15,8 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.DisabledTest; import org.chromium.base.test.util.Feature; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; /** diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/VisualStateTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/VisualStateTest.java index 5857ff1a62557f..acc73ffe334d7b 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/VisualStateTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/VisualStateTest.java @@ -29,8 +29,8 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.Feature; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.JavascriptInjector; import org.chromium.content_public.browser.LoadUrlParams; diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewWebVrTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewWebVrTest.java index 63320bf789d947..21321157451d3c 100644 --- a/android_webview/javatests/src/org/chromium/android_webview/test/WebViewWebVrTest.java +++ b/android_webview/javatests/src/org/chromium/android_webview/test/WebViewWebVrTest.java @@ -14,8 +14,8 @@ import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.Feature; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.JavaScriptUtils; +import org.chromium.content_public.browser.ContentViewCore; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/android_webview/test/shell/DEPS b/android_webview/test/shell/DEPS index e1af4e06632d95..9c8e62d2850c96 100644 --- a/android_webview/test/shell/DEPS +++ b/android_webview/test/shell/DEPS @@ -3,5 +3,4 @@ include_rules = [ "-content/public/android/java", "+content/public/android/java/src/org/chromium/content_public", "!content/public/android/java/src/org/chromium/content/app/ContentApplication.java", - "!content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java", ] diff --git a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java index 5ef7bb924a64cb..f31aacc7fc4302 100644 --- a/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java +++ b/android_webview/test/shell/src/org/chromium/android_webview/test/AwTestContainerView.java @@ -23,7 +23,7 @@ import org.chromium.android_webview.AwContents; import org.chromium.android_webview.shell.DrawGL; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import javax.microedition.khronos.egl.EGLConfig; diff --git a/chrome/android/java/DEPS b/chrome/android/java/DEPS index 44a304f77ea3e8..c47c7725fdc9f5 100644 --- a/chrome/android/java/DEPS +++ b/chrome/android/java/DEPS @@ -27,7 +27,6 @@ include_rules = [ "!content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java", "!content/public/android/java/src/org/chromium/content/browser/ContentVideoViewEmbedder.java", "!content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java", - "!content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java", "!content/public/android/java/src/org/chromium/content/browser/ContentView.java", "!content/public/android/java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java", "!content/public/android/java/src/org/chromium/content/browser/crypto/CipherFactory.java", diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java index e65c8813dcb63d..a7b88d56954b94 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java @@ -67,8 +67,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial; import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager; -import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager - .ContextualSearchTabPromotionDelegate; +import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager.ContextualSearchTabPromotionDelegate; import org.chromium.chrome.browser.datausage.DataUseTabUIManager; import org.chromium.chrome.browser.device.DeviceClassManager; import org.chromium.chrome.browser.dom_distiller.DomDistillerUIUtils; @@ -143,8 +142,8 @@ import org.chromium.chrome.browser.widget.textbubble.TextBubble; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.content.browser.ContentVideoView; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.common.ContentSwitches; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java index f84d77d239fef6..26f353497e9307 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java @@ -53,7 +53,7 @@ import org.chromium.chrome.browser.widget.ClipDrawableProgressBar.DrawingInfo; import org.chromium.chrome.browser.widget.ControlContainer; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.UiUtils; import org.chromium.ui.base.SPenSupport; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayContentDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayContentDelegate.java index a0ba1fb3f92167..3ea68942aac16d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayContentDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayContentDelegate.java @@ -6,7 +6,7 @@ import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler; import org.chromium.components.navigation_interception.NavigationParams; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * An base class for tracking events on the overlay panel. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java index 4d42e14fba596b..efd9ef8dfcbd55 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java @@ -26,7 +26,7 @@ import org.chromium.chrome.browser.compositor.scene_layer.SceneOverlayLayer; import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.common.BrowserControlsState; import org.chromium.ui.base.LocalizationUtils; import org.chromium.ui.resources.ResourceManager; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java index ce7a2192641681..080e7150bbc6a4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java @@ -22,7 +22,7 @@ import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid; import org.chromium.content.browser.ContentVideoViewEmbedder; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContentsObserver; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContentViewDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContentViewDelegate.java index 9eafea9fb6bd35..f6664e6a9d6aa8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContentViewDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContentViewDelegate.java @@ -4,7 +4,7 @@ package org.chromium.chrome.browser.compositor.bottombar; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * The delegate that is notified when the OverlayPanel ContentViewCore is ready to be rendered. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java index a22dd6b7e1c879..6c9802fd0469b9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManager.java @@ -43,7 +43,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver; import org.chromium.chrome.browser.util.ColorUtils; import org.chromium.chrome.browser.util.FeatureUtilities; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.base.SPenSupport; import org.chromium.ui.resources.ResourceManager; import org.chromium.ui.resources.dynamics.DynamicResourceLoader; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerHost.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerHost.java index c3e242cd959c11..cc99e486b23a11 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerHost.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerHost.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.compositor.TitleCache; import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * This is the minimal interface of the host view from the layout side. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/OverlayPanelEventFilter.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/OverlayPanelEventFilter.java index 4bdeac5f66540d..4558349318782e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/OverlayPanelEventFilter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/eventfilter/OverlayPanelEventFilter.java @@ -15,7 +15,7 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.PanelState; import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager; import org.chromium.chrome.browser.contextualsearch.SwipeRecognizer; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import java.util.ArrayList; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java index 189a18efbb197d..1a408fcb188064 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuItemDelegate.java @@ -5,7 +5,7 @@ package org.chromium.chrome.browser.contextmenu; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.common.Referrer; /** diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java index 05e4154a25975e..76cfcffa630999 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java @@ -50,7 +50,7 @@ import org.chromium.components.feature_engagement.Tracker; import org.chromium.components.feature_engagement.TriggerState; import org.chromium.components.navigation_interception.NavigationParams; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationEntry; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java index 97e91e514286cd..3129b105e7c6b7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchSelectionController.java @@ -12,7 +12,7 @@ import org.chromium.chrome.browser.ChromeActivity; import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java index 88545ff639fae4..6a60639460e46c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java @@ -29,7 +29,7 @@ import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils; import org.chromium.components.navigation_interception.InterceptNavigationDelegate; import org.chromium.components.navigation_interception.NavigationParams; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.NavigationEntry; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java index 34d2afa0049507..44540d60b66c0b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java @@ -29,7 +29,7 @@ import org.chromium.chrome.browser.vr_shell.VrShellDelegate; import org.chromium.chrome.browser.widget.ControlContainer; import org.chromium.content.browser.ContentVideoView; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.common.BrowserControlsState; import java.lang.annotation.Retention; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java index aac8ebe6194bfe..81dc5396ae220f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java @@ -20,7 +20,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.widget.Toast; import java.lang.ref.WeakReference; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java index c5ed2e2b22628c..62e7f459a8f3ab 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java @@ -15,7 +15,7 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.metrics.WebApkUma; import org.chromium.chrome.browser.webapps.WebApkActivity; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalPresenter.java b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalPresenter.java index 17de17364b8d62..88488e6283ee99 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalPresenter.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/TabModalPresenter.java @@ -21,7 +21,7 @@ import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver; import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * The presenter that displays a single tab modal dialog. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java index fafe2aea5d06ae..d581d71ba430f9 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java @@ -106,9 +106,9 @@ import org.chromium.components.security_state.ConnectionSecurityLevel; import org.chromium.components.sync.SyncConstants; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.crypto.CipherFactory; import org.chromium.content_public.browser.ChildProcessImportance; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.GestureListenerManager; import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.ImeAdapter; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java index c3965d9565b483..d0521a3bee5711 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java @@ -9,7 +9,7 @@ import android.view.ContextMenu; import org.chromium.chrome.browser.TabLoadStatus; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.WebContents; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java index 8f0f4b1404b9ad..d60c0ea98575ba 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java @@ -45,7 +45,7 @@ import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid; import org.chromium.content.browser.ActivityContentVideoViewEmbedder; import org.chromium.content.browser.ContentVideoViewEmbedder; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.InvalidateTypes; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.common.ResourceRequestBody; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java index 3c2f0e32ca5734..57e5f526f15601 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelUtils.java @@ -6,7 +6,7 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import java.util.ArrayList; import java.util.List; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java index 6d2c5caea6c705..6911164f3a457a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java @@ -50,7 +50,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelUtils; import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet; import org.chromium.chrome.browser.widget.newtab.NewTabButton; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.base.WindowAndroid.PermissionCallback; diff --git a/chrome/android/javatests/DEPS b/chrome/android/javatests/DEPS index 97fc128a3ab74e..9d35a9a28009cf 100644 --- a/chrome/android/javatests/DEPS +++ b/chrome/android/javatests/DEPS @@ -22,7 +22,6 @@ include_rules = [ "+content/public/android/java/src/org/chromium/content_public", "!content/public/android/java/src/org/chromium/content/browser/BindingManager.java", "!content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java", - "!content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java", "!content/public/android/java/src/org/chromium/content/browser/ContentView.java", "!content/public/android/java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java", "!content/public/android/java/src/org/chromium/content/browser/input/ChromiumBaseInputConnection.java", diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java index 5686bd3f428c83..4c5c3c97237961 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ContentViewFocusTest.java @@ -29,11 +29,11 @@ import org.chromium.chrome.test.ChromeTabbedActivityTestRule; import org.chromium.chrome.test.util.ChromeTabUtils; import org.chromium.chrome.test.util.OverviewModeBehaviorWatcher; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.TestTouchUtils; import org.chromium.content.browser.test.util.TouchCommon; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContentsObserver; import org.chromium.ui.test.util.UiRestriction; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenActivityTest.java index 5495b70166bd44..a13f9f4f159ffc 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenActivityTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/FullscreenActivityTest.java @@ -27,10 +27,10 @@ import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.media.MediaSwitches; import org.chromium.net.test.EmbeddedTestServer; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java index 9886d8bc0d7f45..3c23ea37e74fff 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java @@ -18,12 +18,12 @@ import org.chromium.base.test.util.UrlUtils; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Coordinates; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.JavaScriptUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.UiUtils; @@ -32,7 +32,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicReference; - /** * Integration test to ensure that OSK resizes only the visual viewport. */ diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java index b7163641130a31..c712d40bbd62ae 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/SelectFileDialogTest.java @@ -25,10 +25,10 @@ import org.chromium.base.test.util.UrlUtils; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.SelectFileDialog; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java index a17b53e16a13c8..f2988bd44f822b 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java @@ -68,7 +68,6 @@ import org.chromium.chrome.test.util.MenuUtils; import org.chromium.chrome.test.util.NewTabPageTestUtils; import org.chromium.chrome.test.util.OverviewModeBehaviorWatcher; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; @@ -76,6 +75,7 @@ import org.chromium.content.browser.test.util.TouchCommon; import org.chromium.content.browser.test.util.UiUtils; import org.chromium.content.common.ContentSwitches; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.content_public.browser.WebContents; import org.chromium.content_public.browser.WebContentsObserver; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java index 3b309c8ea0320a..1e27ae1468f0f4 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryTest.java @@ -26,10 +26,10 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile; import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.UiUtils; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java index a8f87036af647a..c264993c3fbcf0 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java @@ -25,13 +25,13 @@ import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.components.autofill.AutofillPopup; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.input.ChromiumBaseInputConnection; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper; import org.chromium.content.browser.test.util.TouchCommon; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.ImeAdapter; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.R; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java index 80db7ae93d6f7f..0a1e785f152df1 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java @@ -23,10 +23,10 @@ import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.components.autofill.AutofillPopup; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.R; import org.chromium.ui.UiUtils; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java index bcd709e7f8b119..ef039b7ef1a83c 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelEventFilterTest.java @@ -22,8 +22,8 @@ import org.chromium.base.test.util.Feature; import org.chromium.chrome.browser.compositor.layouts.eventfilter.OverlayPanelEventFilter; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.TestContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * Class responsible for testing the OverlayPanelEventFilter. diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutHost.java b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutHost.java index 1092db0cc6d412..063bc43448556d 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutHost.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/MockLayoutHost.java @@ -11,7 +11,7 @@ import org.chromium.chrome.browser.compositor.TitleCache; import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.resources.ResourceManager; /** diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java index a4a15e9995b7bd..682d5db0fff518 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java @@ -77,13 +77,13 @@ import org.chromium.chrome.test.util.MenuUtils; import org.chromium.chrome.test.util.OmniboxTestUtils; import org.chromium.components.navigation_interception.NavigationParams; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.KeyUtils; import org.chromium.content.browser.test.util.TestSelectionPopupController; import org.chromium.content.browser.test.util.TouchCommon; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.SelectionClient; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.net.test.EmbeddedTestServer; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java index 4361b401e1ef1f..ff4e91e927093f 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java @@ -44,13 +44,13 @@ import org.chromium.chrome.test.util.FullscreenTestUtils; import org.chromium.chrome.test.util.OmniboxTestUtils; import org.chromium.chrome.test.util.PrerenderTestHelper; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.JavaScriptUtils; import org.chromium.content.browser.test.util.TestTouchUtils; import org.chromium.content.browser.test.util.TouchCommon; import org.chromium.content.browser.test.util.UiUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.SelectionPopupController; import org.chromium.net.test.EmbeddedTestServer; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java index b42ef260997ef3..7832185d52dfc7 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java @@ -23,10 +23,10 @@ import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.ActivityWindowAndroid; import org.chromium.ui.base.ViewAndroidDelegate; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestRule.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestRule.java index 5ee7235e9cb484..672f0c1707604b 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestRule.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestRule.java @@ -34,10 +34,10 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestUI; import org.chromium.chrome.browser.payments.ui.PaymentRequestUI.PaymentRequestObserverForTest; import org.chromium.chrome.test.ChromeActivityTestRule; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.payments.mojom.PaymentDetailsModifier; import org.chromium.payments.mojom.PaymentItem; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/TestFramework.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/TestFramework.java index 6bfeae19cab08b..309b7bb5d31f20 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/TestFramework.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/TestFramework.java @@ -14,10 +14,10 @@ import org.chromium.chrome.browser.UrlConstants; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.test.ChromeActivityTestRule; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.JavaScriptUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.lang.annotation.Retention; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellControllerInputTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellControllerInputTest.java index 181a15610e0b81..05b55fdc0145d3 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellControllerInputTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellControllerInputTest.java @@ -27,11 +27,11 @@ import org.chromium.chrome.browser.vr_shell.util.VrTransitionUtils; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.util.ChromeTabUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Coordinates; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.util.concurrent.TimeoutException; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java index da8fc5926d772a..d055d1dd7ab12f 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTest.java @@ -35,9 +35,9 @@ import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.util.ChromeTabUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.ClickUtils; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.util.ArrayList; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTestWebXr.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTestWebXr.java index 5a9437a5622ecd..83e64deaf13184 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTestWebXr.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/VrShellNavigationTestWebXr.java @@ -27,8 +27,8 @@ import org.chromium.chrome.test.ChromeActivityTestRule; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.chrome.test.util.ChromeTabUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.util.concurrent.TimeoutException; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/TransitionUtils.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/TransitionUtils.java index 94124234afc59b..4d3ff139963884 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/TransitionUtils.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/TransitionUtils.java @@ -22,10 +22,10 @@ import org.chromium.chrome.browser.vr_shell.VrClassesWrapperImpl; import org.chromium.chrome.browser.vr_shell.VrIntentUtils; import org.chromium.chrome.browser.vr_shell.VrShellDelegate; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.util.concurrent.Callable; diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/VrTransitionUtils.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/VrTransitionUtils.java index fb541cd92a3804..7a916aa542e2b4 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/VrTransitionUtils.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/VrTransitionUtils.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.vr_shell.TestVrShellDelegate; import org.chromium.chrome.browser.vr_shell.VrTestFramework; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * Class containing utility functions for transitioning between different diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/XrTransitionUtils.java b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/XrTransitionUtils.java index 83152b5b578666..d3bd894c971007 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/XrTransitionUtils.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/vr_shell/util/XrTransitionUtils.java @@ -10,7 +10,7 @@ import org.chromium.chrome.browser.vr_shell.TestVrShellDelegate; import org.chromium.chrome.browser.vr_shell.XrTestFramework; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; /** * Class containing utility functions for transitioning between different diff --git a/chrome/android/sync_shell/javatests/DEPS b/chrome/android/sync_shell/javatests/DEPS index 8bf30683d33a2b..f35aa835b0277b 100644 --- a/chrome/android/sync_shell/javatests/DEPS +++ b/chrome/android/sync_shell/javatests/DEPS @@ -5,7 +5,6 @@ include_rules = [ "-content/public/android/java", "+content/public/android/java/src/org/chromium/content_public", - "!content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java", "-content/public/android/javatests", "+content/public/test/android/javatests", diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java index 88be1262fa2b70..84f022ffc08c1b 100644 --- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java +++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java @@ -32,9 +32,9 @@ import org.chromium.chrome.test.util.browser.sync.SyncTestUtil; import org.chromium.components.signin.AccountIdProvider; import org.chromium.components.sync.AndroidSyncSettings; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; +import org.chromium.content_public.browser.ContentViewCore; /** * Test suite for Sync. diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsService.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsService.java index dea5ba333c663d..1fca41d0718a0c 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsService.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsService.java @@ -14,7 +14,7 @@ import org.chromium.base.Log; import org.chromium.base.annotations.JNINamespace; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.ViewAndroidDelegate; import org.chromium.ui.base.WindowAndroid; diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsSurfaceHelper.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsSurfaceHelper.java index d7eff8e612018e..7a761071422cba 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsSurfaceHelper.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastWebContentsSurfaceHelper.java @@ -22,8 +22,8 @@ import org.chromium.content.browser.ActivityContentVideoViewEmbedder; import org.chromium.content.browser.ContentVideoViewEmbedder; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewRenderView; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.ViewAndroidDelegate; import org.chromium.ui.base.WindowAndroid; diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn index 6341579e443429..4af66da015e285 100644 --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -120,7 +120,6 @@ android_library("content_java") { "java/src/org/chromium/content/browser/ContentVideoView.java", "java/src/org/chromium/content/browser/ContentVideoViewEmbedder.java", "java/src/org/chromium/content/browser/ContentView.java", - "java/src/org/chromium/content/browser/ContentViewCore.java", "java/src/org/chromium/content/browser/ContentViewCoreImpl.java", "java/src/org/chromium/content/browser/ContentViewRenderView.java", "java/src/org/chromium/content/browser/ContentViewStatics.java", @@ -230,6 +229,7 @@ android_library("content_java") { "java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java", "java/src/org/chromium/content_public/browser/ActionModeCallbackHelper.java", "java/src/org/chromium/content_public/browser/ContentBitmapCallback.java", + "java/src/org/chromium/content_public/browser/ContentViewCore.java", "java/src/org/chromium/content_public/browser/GestureListenerManager.java", "java/src/org/chromium/content_public/browser/GestureStateListener.java", "java/src/org/chromium/content_public/browser/ImageDownloadCallback.java", diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java index e97a730ac12a80..fee8b6e7f7b765 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java @@ -23,6 +23,7 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.base.WindowAndroid; /** diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java index 3728d1c73ad97a..8a387fa6aaf1cb 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java @@ -21,6 +21,7 @@ import android.widget.FrameLayout; import org.chromium.base.TraceEvent; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.ImeAdapter; import org.chromium.content_public.browser.SmartClipProvider; import org.chromium.content_public.browser.WebContents; @@ -33,7 +34,6 @@ */ public class ContentView extends FrameLayout implements ContentViewCore.InternalAccessDelegate, SmartClipProvider { - private static final String TAG = "cr.ContentView"; // Default value to signal that the ContentView's size need not be overridden. diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCoreImpl.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCoreImpl.java index 48c29d19189bd3..a81ecd596876e1 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCoreImpl.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCoreImpl.java @@ -23,7 +23,6 @@ import org.chromium.base.VisibleForTesting; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; -import org.chromium.content.browser.ContentViewCore.InternalAccessDelegate; import org.chromium.content.browser.accessibility.WebContentsAccessibilityImpl; import org.chromium.content.browser.accessibility.captioning.CaptioningBridgeFactory; import org.chromium.content.browser.accessibility.captioning.SystemCaptioningBridge; @@ -38,6 +37,8 @@ import org.chromium.content.browser.selection.SelectionPopupControllerImpl; import org.chromium.content.browser.webcontents.WebContentsImpl; import org.chromium.content_public.browser.ActionModeCallbackHelper; +import org.chromium.content_public.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore.InternalAccessDelegate; import org.chromium.content_public.browser.GestureStateListener; import org.chromium.content_public.browser.ImeEventObserver; import org.chromium.content_public.browser.WebContents; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java index 2ac7f06bd63102..70c31f686285a9 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java @@ -15,6 +15,7 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.WindowAndroid; diff --git a/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java b/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java index e5550f3d6a7acb..24918b8324b317 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java @@ -16,7 +16,7 @@ import android.widget.ListView; import org.chromium.content.R; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import java.util.List; diff --git a/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java b/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java index 261cae4a39236b..404fec3df32c6c 100644 --- a/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java +++ b/content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java @@ -9,7 +9,7 @@ import android.widget.AdapterView; import android.widget.PopupWindow; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.DropdownAdapter; import org.chromium.ui.DropdownPopupWindow; diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content_public/browser/ContentViewCore.java similarity index 99% rename from content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java rename to content/public/android/java/src/org/chromium/content_public/browser/ContentViewCore.java index 5c2ba9cd0a228f..98836d659bb372 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java +++ b/content/public/android/java/src/org/chromium/content_public/browser/ContentViewCore.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.content.browser; +package org.chromium.content_public.browser; import android.content.Context; import android.content.res.Configuration; @@ -12,7 +12,7 @@ import android.view.ViewGroup; import org.chromium.base.VisibleForTesting; -import org.chromium.content_public.browser.WebContents; +import org.chromium.content.browser.ContentViewCoreImpl; import org.chromium.ui.base.ViewAndroidDelegate; import org.chromium.ui.base.WindowAndroid; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java index f9f3923381cb2c..ead7bd228d423f 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewCoreSelectionTest.java @@ -31,6 +31,7 @@ import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.ImeAdapter; import org.chromium.content_public.browser.SelectionClient; import org.chromium.content_shell_apk.ContentShellActivityTestRule; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java index 002e8192081138..fbb85812bd2833 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewPopupZoomerTest.java @@ -21,6 +21,7 @@ import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_shell_apk.ContentShellActivityTestRule; import java.util.concurrent.TimeoutException; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java index f3e1c23641c434..1fe8ed1039cf61 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewScrollingTest.java @@ -22,9 +22,9 @@ import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.RetryOnFailure; import org.chromium.base.test.util.UrlUtils; -import org.chromium.content.browser.ContentViewCore.InternalAccessDelegate; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; +import org.chromium.content_public.browser.ContentViewCore.InternalAccessDelegate; import org.chromium.content_shell_apk.ContentShellActivityTestRule; import org.chromium.content_shell_apk.ContentShellActivityTestRule.RerunWithUpdatedContainerView; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java b/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java index fbd76031128631..8b809ac9df9217 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java @@ -23,6 +23,7 @@ import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_shell_apk.ContentShellActivityTestRule; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java index 46243c8ac1b206..1f86b00d44060e 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java @@ -17,6 +17,7 @@ import org.chromium.base.test.util.UrlUtils; import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.NavigationHistory; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java index 3e326573e75e8b..16d05e06f3f583 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java @@ -25,6 +25,7 @@ import org.chromium.base.test.util.Feature; import org.chromium.content.browser.test.ContentJUnit4ClassRunner; import org.chromium.content.browser.webcontents.WebContentsImpl; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.content_shell_apk.ContentShellActivityTestRule; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTest.java b/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTest.java index 763fabb90b5341..ed7b0146325b65 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTest.java @@ -31,9 +31,9 @@ import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.MinAndroidSdkLevel; import org.chromium.base.test.util.UrlUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_shell_apk.ContentShellActivityTestRule; import java.lang.reflect.Method; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java index 19eaea6f323d6b..34251936d4e274 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java @@ -20,7 +20,6 @@ import org.junit.Assert; import org.chromium.base.ThreadUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.selection.SelectionPopupControllerImpl; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; @@ -29,6 +28,7 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper; import org.chromium.content.browser.test.util.TestInputMethodManagerWrapper.InputConnectionProvider; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.ImeAdapter; import org.chromium.content_public.browser.WebContents; import org.chromium.content_shell_apk.ContentShellActivityTestRule; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java index ccf34da0e33742..b07b83f5e5da01 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/SelectPopupTest.java @@ -18,12 +18,12 @@ import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.RetryOnFailure; import org.chromium.base.test.util.UrlUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_shell_apk.ContentShellActivityTestRule; import org.chromium.content_shell_apk.ContentShellActivityTestRule.RerunWithUpdatedContainerView; diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/TextSuggestionMenuTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/TextSuggestionMenuTest.java index 0a8f80e8468815..a5bfbdfa99b7da 100644 --- a/content/public/android/javatests/src/org/chromium/content/browser/input/TextSuggestionMenuTest.java +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/TextSuggestionMenuTest.java @@ -21,13 +21,13 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.CommandLineFlags; import org.chromium.content.R; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.test.ContentJUnit4ClassRunner; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.DOMUtils; import org.chromium.content.browser.test.util.JavaScriptUtils; import org.chromium.content.browser.test.util.TouchCommon; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.util.concurrent.TimeoutException; diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java index 3b9a5f56df86e1..b619ab0ee6fb28 100644 --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/DOMUtils.java @@ -13,9 +13,9 @@ import org.junit.Assert; import org.chromium.base.ThreadUtils; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.RenderCoordinates; import org.chromium.content.browser.webcontents.WebContentsImpl; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import java.io.IOException; diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java index 701106ec2f7148..178a93009a7690 100644 --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java @@ -6,7 +6,7 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.CallbackHelper; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.JavaScriptCallback; import org.chromium.content_public.browser.WebContents; diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewCore.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewCore.java index f0db2d63b89447..16508cee8f183a 100644 --- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewCore.java +++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewCore.java @@ -10,8 +10,8 @@ import android.view.MotionEvent; import android.view.ViewGroup; -import org.chromium.content.browser.ContentViewCore; -import org.chromium.content.browser.ContentViewCore.InternalAccessDelegate; +import org.chromium.content_public.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore.InternalAccessDelegate; import org.chromium.content_public.browser.WebContents; import org.chromium.ui.base.ViewAndroidDelegate; import org.chromium.ui.base.WindowAndroid; diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java index 468ac3220188fe..d60b0c59e1dd00 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java +++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java @@ -30,10 +30,10 @@ import org.chromium.content.browser.ActivityContentVideoViewEmbedder; import org.chromium.content.browser.ContentVideoViewEmbedder; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewCoreImpl; import org.chromium.content.browser.ContentViewRenderView; import org.chromium.content_public.browser.ActionModeCallbackHelper; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationController; import org.chromium.content_public.browser.SelectionPopupController; diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java index 751d2cf916d6fc..4fc7c35e4ada21 100644 --- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java +++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java @@ -12,8 +12,8 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.annotations.CalledByNative; import org.chromium.base.annotations.JNINamespace; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewRenderView; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.ui.base.WindowAndroid; /** diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java index 528128b0a887e8..ca3f1db68d936b 100644 --- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java +++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java @@ -24,13 +24,13 @@ import org.chromium.base.test.util.CallbackHelper; import org.chromium.base.test.util.UrlUtils; import org.chromium.content.browser.ContentView; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.ContentViewCoreImpl; import org.chromium.content.browser.RenderCoordinates; import org.chromium.content.browser.test.util.Criteria; import org.chromium.content.browser.test.util.CriteriaHelper; import org.chromium.content.browser.test.util.TestCallbackHelperContainer; import org.chromium.content.browser.webcontents.WebContentsImpl; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.JavascriptInjector; import org.chromium.content_public.browser.LoadUrlParams; import org.chromium.content_public.browser.NavigationController; diff --git a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java index a283ed549c2b47..6923436fcdda7a 100644 --- a/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java +++ b/content/shell/android/linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java @@ -18,7 +18,7 @@ import org.chromium.base.library_loader.Linker; import org.chromium.base.library_loader.ProcessInitException; import org.chromium.content.browser.BrowserStartupController; -import org.chromium.content.browser.ContentViewCore; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_shell.Shell; import org.chromium.content_shell.ShellManager; import org.chromium.ui.base.ActivityWindowAndroid; diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java index 1ce2777dd71e00..274956f4fc5464 100644 --- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java +++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java @@ -18,8 +18,8 @@ import org.chromium.base.library_loader.LibraryProcessType; import org.chromium.base.library_loader.ProcessInitException; import org.chromium.content.browser.BrowserStartupController; -import org.chromium.content.browser.ContentViewCore; import org.chromium.content.browser.DeviceUtils; +import org.chromium.content_public.browser.ContentViewCore; import org.chromium.content_public.browser.WebContents; import org.chromium.content_shell.Shell; import org.chromium.content_shell.ShellManager;