Android: consolidate support components for embedders

Moves web_contents_delegate_android under embedder_support to consolidate all the support components for embedders. The package path is org.chromium.embedder_support.delegate. Now the component has 4 main targets for embedders: - media - view - content_view - web_contents_delegate Note: - The choice of 'delegate' in the package name of WebContentsDelegateAndroid is just to avoid having WCDA repeated in the path. (import org.chromium .embedder_support.web_contents_delegate_android.WebContentsDelegateAndroid looked odd to me). - Got rid of 'android' wherever it is repeated in the path, and the deletion won't cause confusion. e.g. web_contents_delegate_android_java -> web_contents_delegate_java - Needs changes in the internal repo as well https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/646448 Change-Id: I44c25435c32330439ffa765d80df45b02d0694b1 Reviewed-on: https://chromium-review.googlesource.com/1118926 Reviewed-by: Bo <boliu@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Tommy Nyquist <nyquist@chromium.org> Reviewed-by: Cait Phillips <caitkp@chromium.org> Reviewed-by: agrieve <agrieve@chromium.org> Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org> Cr-Commit-Position: refs/heads/master@{#574401}
marcosholgado · Jul 11, 2018 · 351a925 · 351a925
1 parent a94a218
commit 351a925
Show file tree

Hide file tree

Showing 101 changed files with 182 additions and 187 deletions.
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
@@ -713,6 +713,7 @@ source_set("common") {
     "//components/crash/content/app",
     "//components/crash/content/browser",
     "//components/download/public/common:public",
+    "//components/embedder_support/android:web_contents_delegate",
     "//components/google/core/browser",
     "//components/heap_profiling",
     "//components/keyed_service/content",
@@ -750,7 +751,6 @@ source_set("common") {
     "//components/visitedlink/browser",
     "//components/visitedlink/renderer",
     "//components/viz/service",
-    "//components/web_contents_delegate_android:web_contents_delegate_android",
     "//components/web_restrictions:browser",
     "//content",
     "//content/public/app:both",
@@ -894,14 +894,14 @@ android_library("android_webview_java") {
     "//components/autofill/android:provider_java",
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/crash/android:java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/policy/android:policy_java",
     "//components/safe_browsing/android:safe_browsing_java",
     "//components/variations:load_seed_result_enum_java",
     "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:client_java",
     "//content/public/android:content_java",
     "//device/gamepad:java",

diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
@@ -46,7 +46,7 @@ include_rules = [
   "+media/base/android",
 
   "+components/policy/policy_constants.h",
-  "+components/web_contents_delegate_android",
+  "+components/embedder_support/android",
 
   "+printing",
 

diff --git a/android_webview/browser/aw_web_contents_delegate.h b/android_webview/browser/aw_web_contents_delegate.h
@@ -5,7 +5,7 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_AW_WEB_CONTENTS_DELEGATE_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_WEB_CONTENTS_DELEGATE_H_
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 
 namespace android_webview {
 

diff --git a/android_webview/java/DEPS b/android_webview/java/DEPS
@@ -1,11 +1,11 @@
 include_rules = [
   "+components/autofill/android/java",
   "+components/background_task_scheduler/android/java",
+  "+components/embedder_support/android/java",
   "+components/minidump_uploader/android/java",
   "+components/navigation_interception/android/java",
   "+components/policy/android/java",
   "+components/safe_browsing/android/java",
-  "+components/web_contents_delegate_android/java",
   "+components/variations/android/java",
 
   "-content/public/android/java",

diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
@@ -7,7 +7,7 @@
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 
 /**
  * WebView-specific WebContentsDelegate.

diff --git a/android_webview/test/BUILD.gn b/android_webview/test/BUILD.gn
@@ -131,12 +131,12 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/autofill/android:provider_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/minidump_uploader:minidump_uploader_javatests",
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
     "//components/safe_browsing/android:safe_browsing_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//mojo/public/java:bindings_java",

diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
@@ -157,7 +157,7 @@ Still reading?
     <ignore regexp="tools/android/push_apps_to_background/res"/>
     <ignore regexp="ui/android/java/res"/>
     <!-- crbug.com/457918 is tracking missing assets -->
-    <ignore regexp="components/web_contents_delegate_android/java/res"/>
+    <ignore regexp="components/embedder_support/android/java/res"/>
   </issue>
   <issue id="ImpliedQuantity" severity="Error">
     <ignore regexp="chrome/android/chrome_strings_grd"/>

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -236,6 +236,7 @@ android_library("chrome_java") {
     "//components/download/public/common:public_java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:media_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
@@ -255,7 +256,6 @@ android_library("chrome_java") {
     "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
     "//components/viz/service:service_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:provider_java",
     "//content/public/android:content_java",
     "//device/gamepad:java",
@@ -580,6 +580,7 @@ android_library("chrome_test_java") {
     "//components/crash/android:javatests",
     "//components/dom_distiller/core/android:dom_distiller_core_java",
     "//components/download/internal/background_service:internal_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
@@ -603,7 +604,6 @@ android_library("chrome_test_java") {
     "//components/sync/android:sync_java",
     "//components/sync/android:sync_javatests",
     "//components/url_formatter/android:url_formatter_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:provider_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",

diff --git a/chrome/android/java/DEPS b/chrome/android/java/DEPS
@@ -6,6 +6,7 @@ include_rules = [
   "+components/crash/android/java",
   "+components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content",
   "+components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core",
+  "+components/embedder_support/android/delegate",
   "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement",
   "+components/gcm_driver/android/java/src/org/chromium/components/gcm_driver",
   "+components/location/android/java",
@@ -14,7 +15,6 @@ include_rules = [
   "+components/offline_items_collection/core/android/java",
   "+components/payments/content/android/java/src/org/chromium/components/payments",
   "+components/sync/android/java/src/org/chromium/components/sync",
-  "+components/web_contents_delegate_android",
   "+components/web_restrictions",
 
   "-content/public/android",

diff --git a/...ndroid/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java b/...ndroid/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java
@@ -19,10 +19,10 @@
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.embedder_support.view.ContentView;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 import org.chromium.content_public.browser.ContentVideoViewEmbedder;
 import org.chromium.content_public.browser.ContentViewCore;
 import org.chromium.content_public.browser.LoadUrlParams;

diff --git a/...me/android/java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java b/...me/android/java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java
@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.document;
 
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.content_public.browser.WebContents;
 
 /**
@@ -48,4 +48,4 @@ private DocumentWebContentsDelegate() {
     private native long nativeInitialize();
     private native void nativeAttachContents(
             long nativeDocumentWebContentsDelegate, WebContents webContents);
-}
+}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabDelegateFactory.java
@@ -6,8 +6,8 @@
 
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 
 /**
  * A factory class to create {@link Tab} related delegates.

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
@@ -43,8 +43,8 @@
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.tabmodel.TabWindowManager;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.embedder_support.media.ActivityContentVideoViewEmbedder;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 import org.chromium.content_public.browser.ContentVideoViewEmbedder;
 import org.chromium.content_public.browser.GestureListenerManager;
 import org.chromium.content_public.browser.InvalidateTypes;

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -2434,12 +2434,12 @@ jumbo_split_static_library("browser") {
       "//chrome/services/media_gallery_util/public/cpp",
       "//components/cdm/browser",
       "//components/data_usage/android",
+      "//components/embedder_support/android:web_contents_delegate",
       "//components/feed:buildflags",
       "//components/feed:feature_list",
       "//components/payments/content/android",
       "//components/resources:components_resources",
       "//components/toolbar",
-      "//components/web_contents_delegate_android",
       "//rlz:rlz_utils",
       "//sandbox",
       "//sandbox:sandbox_buildflags",

diff --git a/chrome/browser/android/DEPS b/chrome/browser/android/DEPS
@@ -2,13 +2,13 @@ include_rules = [
   "-components/devtools_bridge",
   "+cc/layers/layer.h",
   "+chrome_jni_registration/chrome_jni_registration.h",
+  "+components/embedder_suport",
   "+components/ntp_snippets",
   "+components/spellcheck/browser",
   "+components/sync/android",
   "+components/sync/test/fake_server/android",
   "+components/toolbar",
   "+components/viz/common/gpu/context_provider.h",
-  "+components/web_contents_delegate_android",
   "+device/vr/buildflags/buildflags.h",
   "+sandbox/linux/seccomp-bpf/sandbox_bpf.h",
   "+sandbox/linux/seccomp-bpf-helpers",

diff --git a/chrome/browser/android/bottombar/overlay_panel_content.cc b/chrome/browser/android/bottombar/overlay_panel_content.cc
@@ -16,10 +16,10 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "chrome/common/chrome_render_frame.mojom.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/variations/variations_associated_data.h"
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_controls_state.h"

diff --git a/chrome/browser/android/document/document_web_contents_delegate.cc b/chrome/browser/android/document/document_web_contents_delegate.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/android/document/document_web_contents_delegate.h"
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/DocumentWebContentsDelegate_jni.h"
 

diff --git a/chrome/browser/android/document/document_web_contents_delegate.h b/chrome/browser/android/document/document_web_contents_delegate.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 
 // Stub WebContentsDelegateAndroid that is meant to be a temporary substitute
 // for a real WebContentsDelegate for the (expectedly short) period between when

diff --git a/chrome/browser/android/tab_web_contents_delegate_android.h b/chrome/browser/android/tab_web_contents_delegate_android.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_ANDROID_TAB_WEB_CONTENTS_DELEGATE_ANDROID_H_
 
 #include "base/files/file_path.h"
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
@@ -1237,9 +1237,9 @@ split_static_library("ui") {
     ]
     deps += [
       "//chrome/browser:jni_headers",
+      "//components/embedder_support/android:web_contents_delegate",
       "//components/navigation_interception",
       "//components/subresource_filter/core/browser:browser",
-      "//components/web_contents_delegate_android",
       "//crypto:platform",
       "//device/usb/mojo",
       "//device/usb/public/cpp",

diff --git a/chrome/browser/ui/android/color_chooser_dialog_android.cc b/chrome/browser/ui/android/color_chooser_dialog_android.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 
 // The actual android color chooser is at
-// components/web_contents_delegate_android/color_chooser_android.cc
+// components/embedder_support/android/delegate/color_chooser_android.cc
 
 namespace chrome {
 

diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
@@ -74,14 +74,14 @@ android_library("chrome_java_test_support") {
     "//chrome/android:chrome_java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//components/bookmarks/common/android:bookmarks_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/invalidation/impl:java",
     "//components/location/android:location_java",
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
     "//components/signin/core/browser/android:java",
     "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync/android:sync_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java",

diff --git a/components/OWNERS b/components/OWNERS
@@ -30,7 +30,7 @@ per-file sync_ui_strings.grdp=file://components/sync/OWNERS
 per-file translate_strings.grdp=file://components/translate/OWNERS
 per-file undo_strings.grdp=file://components/undo/OWNERS
 per-file version_ui_strings.grdp=file://components/version_ui/OWNERS
-per-file web_contents_delegate_android_strings.grdp=file://components/web_contents_delegate_android/OWNERS
+per-file web_contents_delegate_android_strings.grdp=file://components/embedder_support/android/delegate/OWNERS
 
 # These are for the common case of adding or removing tests. If you're making
 # structural changes, please get a review from one of the overall components