Move rest of //chrome/browser/ui/widget/ to //components

BUG=1030785

Change-Id: I09a6cc7a20b48567c23e76b8657ff90536c8b000
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2016663
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735244}

chrome/android/BUILD.gn

@@ -143,7 +143,6 @@ android_resources("chrome_app_java_resources") {
     "//chrome/browser/settings:java_resources",
     "//chrome/browser/ui/android/appmenu:java_resources",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
-    "//chrome/browser/ui/android/widget:ui_widget_java_resources",
     "//chrome/browser/ui/messages/android:java_resources",
     "//components/app_modal/android:java_resources",
     "//components/autofill/android:autofill_java_resources",
@@ -259,7 +258,6 @@ android_library("chrome_java") {
     "//chrome/browser/ui/android/appmenu:factory_java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/native_page:java",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/lib/lifecycle/public/android:java",
@@ -650,11 +648,11 @@ junit_binary("chrome_junit_tests") {
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/preferences:preferences_junit_tests",
     "//chrome/browser/ui/android/appmenu/internal:junit",
-    "//chrome/browser/ui/android/widget:ui_widget_junit_tests",
     "//chrome/browser/ui/messages/android:junit",
     "//chrome/test/android:chrome_java_test_support",
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/bookmarks/common/android:bookmarks_java",
+    "//components/browser_ui/widget/android:junit",
     "//components/invalidation/impl:java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/module_installer/android:module_installer_java",
@@ -771,8 +769,6 @@ android_library("chrome_test_java") {
     "//chrome/browser/settings:java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu:test_support_java",
-    "//chrome/browser/ui/android/widget:java",
-    "//chrome/browser/ui/android/widget:test_support_java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/lib/lifecycle/public/android:java",
@@ -789,6 +785,7 @@ android_library("chrome_test_java") {
     "//components/browser_ui/styles/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/browser_ui/widget/android:javatests",
+    "//components/browser_ui/widget/android:test_support_java",
     "//components/crash/android:java",
     "//components/dom_distiller/core/android:dom_distiller_core_java",
     "//components/download/internal/background_service:internal_java",
@@ -1997,7 +1994,6 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/browser/subresource_filter:subresource_filter_javatests",
     "//chrome/browser/touch_to_fill/android:test_java",
     "//chrome/browser/ui/android/appmenu/internal:javatests",
-    "//chrome/browser/ui/android/widget:ui_widget_java_tests",
     "//chrome/browser/ui/messages/android:javatests",
     "//chrome/browser/util:javatests",
   ]

chrome/android/DEPS

@@ -4,7 +4,6 @@ include_rules = [
   "+chrome/browser/preferences/android/java",
   "+chrome/browser/settings/android",
   "+chrome/browser/ui/android/native_page",
-  "+chrome/browser/ui/android/widget",
   "+chrome/browser/util/android/java",
   "+components/app_modal/android",
   "+components/browser_ui/modaldialog/android",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -36,7 +36,6 @@ android_library("java") {
     "//chrome/android:chrome_public_java",
     "//chrome/android/public/profiles:java",
     "//chrome/browser/image_fetcher:java",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/modaldialog/android:java",
@@ -257,7 +256,6 @@ android_library("test_java") {
     "//chrome/android:chrome_test_util_java",
     "//chrome/browser/image_fetcher:java",
     "//chrome/browser/preferences:java",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/autofill_assistant/browser:proto_java",
     "//components/browser_ui/widget/android:java",

chrome/android/features/autofill_assistant/java/DEPS

@@ -1,7 +1,7 @@
 include_rules = [
   "+chrome/browser/image_fetcher",
-  "+chrome/browser/ui/android/widget",
   "+chrome/browser/ui/messages/android/java",
+  "+components/browser_ui/widget/android",
   "+content/public/android/java/src/org/chromium/content_public/browser",
   "+content/public/android/java/src/org/chromium/content/browser/picker",
 ]

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/header/AssistantHeaderViewBinder.java

@@ -17,8 +17,8 @@ import org.chromium.chrome.browser.autofill_assistant.carousel.AssistantChip;
 import org.chromium.chrome.browser.autofill_assistant.carousel.AssistantChipViewHolder;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.sync.SyncAndServicesSettings;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
 import org.chromium.ui.widget.ViewRectProvider;

chrome/android/features/autofill_assistant/javatests/DEPS

@@ -1,5 +1,5 @@
 include_rules = [
   "+chrome/lib/image_fetcher",
-  "+chrome/browser/ui/android/widget",
+  "+components/browser_ui/widget/android",
   "+content/public/android/java/src/org/chromium/content_public/browser",
 ]

chrome/android/features/keyboard_accessory/DEPS

@@ -1,7 +1,7 @@
 include_rules = [
-  "+chrome/browser/ui/android/widget",
   "+chrome/browser/ui/messages/android/java",
   "+components/autofill/android/java/src/org/chromium/components/autofill",
+  "+components/browser_ui/widget/android",
   "+components/embedder_support/android/java",
   "+components/feature_engagement/public",
   "-content/public/android",

chrome/android/features/keyboard_accessory/internal/BUILD.gn

@@ -18,9 +18,9 @@ android_library("internal_java") {
     "//chrome/android/features/keyboard_accessory/public:public_java",
     "//chrome/android/public/profiles:java",
     "//chrome/browser/flags:java",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/util:java",
     "//components/autofill/android:autofill_java",
+    "//components/browser_ui/widget/android:java",
     "//components/feature_engagement/public:public_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryIPHUtils.java

@@ -11,8 +11,8 @@ import androidx.annotation.StringRes;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.keyboard_accessory.R;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ui.widget.textbubble.ImageTextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.textbubble.ImageTextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;

chrome/android/features/start_surface/DEPS

@@ -1,4 +1,4 @@
 include_rules = [
-  "+chrome/browser/ui/android/widget",
+  "+components/browser_ui/widget/android",
   "+content/public/android/java/src/org/chromium/content_public",
-]
+]

chrome/android/features/start_surface/internal/BUILD.gn

@@ -49,7 +49,6 @@ android_library("java") {
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//chrome/browser/flags:java",
     "//chrome/browser/preferences:java",
-    "//chrome/browser/ui/android/widget:java",
     "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_design_java",

chrome/android/features/tab_ui/BUILD.gn

@@ -125,7 +125,6 @@ android_library("java") {
     "//chrome/app:java_strings_grd",
     "//chrome/browser/flags:java",
     "//chrome/browser/ui/android/strings:ui_strings_grd",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/ui/messages/android:java",
     "//chrome/browser/util:java",
     "//chrome/lib/lifecycle/public/android:java",

chrome/android/features/tab_ui/java/DEPS

@@ -1,10 +1,9 @@
 include_rules = [
  "+chrome/lib/lifecycle/public/android/java/src/org/chromium/chrome/browser/lifecycle",
- "+chrome/browser/ui/android/widget",
  "+chrome/browser/ui/messages/android/java",
  "+chrome/browser/util",
-
  "+components/browser_ui/styles/android",
+ "+components/browser_ui/widget/android",
  "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement",
  "+components/module_installer",
 

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_groups/TabGroupUtils.java

@@ -23,9 +23,9 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.chrome.tab_ui.R;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.content_public.browser.NavigationHandle;

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/tooltip/BasicTooltipApi.java

@@ -12,8 +12,8 @@ import org.chromium.chrome.browser.feed.library.api.host.stream.TooltipApi;
 import org.chromium.chrome.browser.feed.library.api.host.stream.TooltipCallbackApi;
 import org.chromium.chrome.browser.feed.library.api.host.stream.TooltipInfo;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.ui.widget.ViewRectProvider;
 

chrome/android/java/DEPS

@@ -5,7 +5,6 @@ include_rules = [
   "+chrome/browser/share/android",
   "+chrome/browser/ui/android/appmenu",
   "-chrome/browser/ui/android/appmenu/internal",
-  "+chrome/browser/ui/android/widget",
   "+chrome/browser/ui/messages/android/java",
   "+chrome/browser/download/android/java",
   "+chrome/browser/image_fetcher/android/java",
@@ -16,6 +15,7 @@ include_rules = [
   "+components/autofill/android/java/src/org/chromium/components/autofill",
   "+components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler",
   "+components/bookmarks/common/android/java/src/org/chromium/components/bookmarks",
+  "+components/browser_ui/widget/android",
   "+components/browser_ui/styles/android",
   "+components/crash/android/java",
   "+components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content",

chrome/android/java/res/layout/accept_languages_item.xml

@@ -39,7 +39,7 @@
 
     </LinearLayout>
 
-    <org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton
+    <org.chromium.components.browser_ui.widget.listmenu.ListMenuButton
         android:id="@+id/more"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"

chrome/android/java/res/layout/list_menu_button.xml

@@ -5,7 +5,7 @@
      found in the LICENSE file.
 -->
 
-<org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton
+<org.chromium.components.browser_ui.widget.listmenu.ListMenuButton
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -154,7 +154,6 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
 import org.chromium.chrome.browser.ui.system.StatusBarColorController;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.chrome.browser.vr.ArDelegate;
 import org.chromium.chrome.browser.vr.ArDelegateProvider;
@@ -164,6 +163,7 @@ import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.module_installer.builder.Module;

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java

@@ -18,11 +18,11 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.incognito.IncognitoUtils;
 import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
-import org.chromium.chrome.browser.ui.widget.dragreorder.DragReorderableListAdapter;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
+import org.chromium.components.browser_ui.widget.dragreorder.DragReorderableListAdapter;
 import org.chromium.content_public.browser.LoadUrlParams;
 
 import java.util.List;

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java

@@ -5,10 +5,10 @@
 package org.chromium.chrome.browser.bookmarks;
 
 import org.chromium.chrome.browser.favicon.LargeIconBridge;
-import org.chromium.chrome.browser.ui.widget.dragreorder.DragStateDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
 
 /**
  * Interface used by UI components in the main bookmarks UI to broadcast UI change notifications

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

@@ -29,12 +29,12 @@ import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
-import org.chromium.chrome.browser.ui.widget.dragreorder.DragStateDelegate;
 import org.chromium.chrome.browser.util.ConversionUtils;
 import org.chromium.chrome.browser.widget.selection.SelectableListLayout;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.SearchDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
 
 import java.util.Stack;
 

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkRow.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.bookmarks;
 
-import static org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu.buildMenuListItem;
+import static org.chromium.components.browser_ui.widget.listmenu.BasicListMenu.buildMenuListItem;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -18,14 +18,14 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton.PopupMenuShownListener;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButtonDelegate;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.chrome.browser.widget.selection.SelectableItemView;
 import org.chromium.components.bookmarks.BookmarkId;
+import org.chromium.components.browser_ui.widget.listmenu.BasicListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton.PopupMenuShownListener;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButtonDelegate;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 
 import java.lang.annotation.Retention;

chrome/android/java/src/org/chromium/chrome/browser/bookmarks/ReorderBookmarkItemsAdapter.java

@@ -25,10 +25,10 @@ import org.chromium.chrome.browser.bookmarks.BookmarkManager.ItemsAdapter;
 import org.chromium.chrome.browser.bookmarks.BookmarkRow.Location;
 import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
-import org.chromium.chrome.browser.ui.widget.dragreorder.DragReorderableListAdapter;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighter;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
+import org.chromium.components.browser_ui.widget.dragreorder.DragReorderableListAdapter;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighter;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchIPH.java

@@ -12,8 +12,8 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/OfflineItemViewHolder.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.download.home.list.holder;
 
-import static org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu.buildMenuListItem;
+import static org.chromium.components.browser_ui.widget.listmenu.BasicListMenu.buildMenuListItem;
 
 import android.graphics.Matrix;
 import android.graphics.drawable.BitmapDrawable;
@@ -21,12 +21,12 @@ import org.chromium.chrome.browser.download.home.list.UiUtils;
 import org.chromium.chrome.browser.download.home.list.view.AsyncImageView;
 import org.chromium.chrome.browser.download.home.metrics.UmaUtils;
 import org.chromium.chrome.browser.download.home.view.SelectionView;
-import org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButtonDelegate;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.chrome.download.R;
+import org.chromium.components.browser_ui.widget.listmenu.BasicListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButtonDelegate;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.components.offline_items_collection.OfflineItem;
 import org.chromium.components.offline_items_collection.OfflineItemVisuals;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;

chrome/android/java/src/org/chromium/chrome/browser/download/home/toolbar/ToolbarUtils.java

@@ -9,9 +9,9 @@ import android.view.View;
 
 import org.chromium.chrome.browser.download.DirectoryOption;
 import org.chromium.chrome.browser.download.DownloadDirectoryProvider;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighter;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighter;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.ui.widget.ViewRectProvider;

chrome/android/java/src/org/chromium/chrome/browser/explore_sites/ExploreSitesIPH.java

@@ -12,10 +12,10 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.suggestions.tile.TileView;
-import org.chromium.chrome.browser.ui.widget.highlight.PulseDrawable;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighter;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.highlight.PulseDrawable;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighter;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.ui.widget.ViewRectProvider;

chrome/android/java/src/org/chromium/chrome/browser/infobar/IPHBubbleDelegateImpl.java

@@ -17,8 +17,8 @@ import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.PopupState;
 import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.TrackerParameters;
 import org.chromium.chrome.browser.permissions.PermissionSettingsBridge;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 

chrome/android/java/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupport.java

@@ -12,7 +12,7 @@ import androidx.annotation.StringRes;
 
 import org.chromium.chrome.browser.infobar.InfoBarContainer.InfoBarContainerObserver;
 import org.chromium.chrome.browser.infobar.InfoBarContainerLayout.Item;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.FeatureConstants;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

@@ -58,10 +58,10 @@ import org.chromium.chrome.browser.tasks.ReturnToChromeExperimentsUtil;
 import org.chromium.chrome.browser.toolbar.ToolbarDataProvider;
 import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback;
 import org.chromium.chrome.browser.ui.native_page.NativePage;
-import org.chromium.chrome.browser.ui.widget.CompositeTouchDelegate;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.components.browser_ui.styles.ChromeColors;
+import org.chromium.components.browser_ui.widget.CompositeTouchDelegate;
 import org.chromium.components.search_engines.TemplateUrlService;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.DeviceFormFactor;

chrome/android/java/src/org/chromium/chrome/browser/omnibox/status/StatusView.java

@@ -28,7 +28,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
 import org.chromium.chrome.browser.toolbar.ToolbarCommonPropertiesModel;
-import org.chromium.chrome.browser.ui.widget.CompositeTouchDelegate;
+import org.chromium.components.browser_ui.widget.CompositeTouchDelegate;
 import org.chromium.ui.widget.Toast;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguageListBaseAdapter.java

@@ -22,10 +22,10 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ui.widget.dragreorder.DragReorderableListAdapter;
-import org.chromium.chrome.browser.ui.widget.dragreorder.DragStateDelegate;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButtonDelegate;
+import org.chromium.components.browser_ui.widget.dragreorder.DragReorderableListAdapter;
+import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButtonDelegate;
 
 import java.util.ArrayList;
 import java.util.List;

chrome/android/java/src/org/chromium/chrome/browser/settings/languages/LanguageListPreference.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.settings.languages;
 
-import static org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu.buildMenuListItem;
-import static org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu.buildMenuListItemWithEndIcon;
+import static org.chromium.components.browser_ui.widget.listmenu.BasicListMenu.buildMenuListItem;
+import static org.chromium.components.browser_ui.widget.listmenu.BasicListMenu.buildMenuListItemWithEndIcon;
 
 import android.content.Context;
 import android.support.v7.preference.Preference;
@@ -21,10 +21,10 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.translate.TranslateBridge;
-import org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.components.browser_ui.widget.TintedDrawable;
+import org.chromium.components.browser_ui.widget.listmenu.BasicListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 

chrome/android/java/src/org/chromium/chrome/browser/tab/DEPS

@@ -11,8 +11,8 @@ include_rules = [
   "+chrome/browser/flags",
   "+chrome/browser/preferences",
   "+chrome/browser/ui/android/native_page",
-  "+chrome/browser/ui/android/widget",
   "+components/browser_ui/styles/android",
+  "+components/browser_ui/widget/android",
   "+content/public/android/java/src/org/chromium/content_public",
 ]
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/MenuButton.java

@@ -26,8 +26,8 @@ import org.chromium.chrome.browser.ThemeColorProvider.TintObserver;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper.MenuButtonState;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper;
-import org.chromium.chrome.browser.ui.widget.highlight.PulseDrawable;
 import org.chromium.components.browser_ui.widget.animation.Interpolators;
+import org.chromium.components.browser_ui.widget.highlight.PulseDrawable;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherButtonView.java

@@ -9,7 +9,7 @@ import android.content.res.ColorStateList;
 import android.util.AttributeSet;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
 
 /**
  * The Button used for switching tabs. Currently this class is only being used for the bottom

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -109,12 +109,12 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuObserver;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuPropertiesDelegate;
 import org.chromium.chrome.browser.ui.appmenu.MenuButtonDelegate;
 import org.chromium.chrome.browser.ui.native_page.NativePage;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.browser.widget.ScrimView.ScrimObserver;
 import org.chromium.chrome.browser.widget.ScrimView.ScrimParams;
 import org.chromium.components.browser_ui.styles.ChromeColors;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.components.search_engines.TemplateUrl;

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/StartSurfaceToolbarView.java

@@ -24,10 +24,10 @@ import org.chromium.chrome.browser.toolbar.MenuButton;
 import org.chromium.chrome.browser.toolbar.NewTabButton;
 import org.chromium.chrome.browser.toolbar.top.StartSurfaceToolbarProperties.IPHContainer;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.components.browser_ui.styles.ChromeColors;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 
 /** View of the StartSurfaceToolbar */
 class StartSurfaceToolbarView extends RelativeLayout {

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuCoordinator.java

@@ -4,8 +4,8 @@
 
 package org.chromium.chrome.browser.toolbar.top;
 
-import static org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu.buildMenuDivider;
-import static org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu.buildMenuListItem;
+import static org.chromium.components.browser_ui.widget.listmenu.BasicListMenu.buildMenuDivider;
+import static org.chromium.components.browser_ui.widget.listmenu.BasicListMenu.buildMenuListItem;
 
 import android.content.Context;
 import android.view.View;
@@ -19,11 +19,11 @@ import androidx.annotation.VisibleForTesting;
 import org.chromium.base.Callback;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ui.widget.listmenu.BasicListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenu;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButtonDelegate;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuItemProperties;
+import org.chromium.components.browser_ui.widget.listmenu.BasicListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButtonDelegate;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 import org.chromium.ui.widget.RectProvider;

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToggleTabStackButton.java

@@ -13,7 +13,7 @@ import androidx.annotation.Nullable;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.toolbar.TabCountProvider;
 import org.chromium.chrome.browser.toolbar.TabSwitcherDrawable;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
 import org.chromium.ui.widget.Toast;
 
 /**

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java

@@ -48,8 +48,8 @@ import org.chromium.chrome.browser.toolbar.ToolbarProgressBar;
 import org.chromium.chrome.browser.toolbar.ToolbarTabController;
 import org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator.UrlExpansionObserver;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.ViewUtils;

chrome/android/java/src/org/chromium/chrome/browser/user_education/UserEducationHelper.java

@@ -9,9 +9,9 @@ import android.view.View;
 
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighter;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighter;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.Tracker;
 import org.chromium.ui.widget.ViewRectProvider;
 

chrome/android/javatests/DEPS

@@ -3,7 +3,6 @@ include_rules = [
   "+chrome/browser/preferences/android/java",
   "+chrome/browser/ui/android/appmenu",
   "-chrome/browser/ui/android/appmenu/internal",
-  "+chrome/browser/ui/android/widget",
   "+chrome/browser/ui/messages/android/java",
   "+chrome/browser/util/android",
   "+chrome/lib/lifecycle/public",
@@ -11,6 +10,7 @@ include_rules = [
   "+components/background_task_scheduler/android/java",
   "+components/bookmarks/common/android/java/src/org/chromium/components/bookmarks",
   "+components/browser_ui/styles/android",
+  "+components/browser_ui/widget/android",
   "+components/crash/android",
   "+components/embedder_support/android",
   "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement",

chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkReorderTest.java

@@ -9,8 +9,8 @@ import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
-import static org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighterTestUtils.checkHighlightOff;
-import static org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighterTestUtils.checkHighlightPulse;
+import static org.chromium.components.browser_ui.widget.highlight.ViewHighlighterTestUtils.checkHighlightOff;
+import static org.chromium.components.browser_ui.widget.highlight.ViewHighlighterTestUtils.checkHighlightPulse;
 
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
@@ -33,13 +33,13 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserve
 import org.chromium.chrome.browser.bookmarks.BookmarkPromoHeader.PromoState;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.night_mode.ChromeNightModeTestUtils;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar.ViewType;
 import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
 import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.chrome.test.util.browser.RecyclerViewTestUtils;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.bookmarks.BookmarkType;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
 import org.chromium.components.sync.AndroidSyncSettings;
 import org.chromium.components.sync.test.util.MockSyncContentResolverDelegate;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java

@@ -21,9 +21,9 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.omnibox.status.StatusProperties.StatusIconResource;
 import org.chromium.chrome.browser.omnibox.status.StatusView.StatusViewDelegate;
 import org.chromium.chrome.browser.toolbar.LocationBarModel;
-import org.chromium.chrome.browser.ui.widget.CompositeTouchDelegate;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
+import org.chromium.components.browser_ui.widget.CompositeTouchDelegate;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
 import org.chromium.ui.test.util.DummyUiActivityTestCase;

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java

@@ -33,9 +33,9 @@ import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.omnibox.status.StatusProperties.StatusIconResource;
 import org.chromium.chrome.browser.toolbar.LocationBarModel;
-import org.chromium.chrome.browser.ui.widget.CompositeTouchDelegate;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.Features.EnableFeatures;
+import org.chromium.components.browser_ui.widget.CompositeTouchDelegate;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
 import org.chromium.ui.test.util.DummyUiActivityTestCase;

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/top/TabSwitcherActionMenuRenderTest.java

@@ -22,9 +22,9 @@ import org.chromium.base.test.params.ParameterSet;
 import org.chromium.base.test.params.ParameterizedRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ui.widget.listmenu.ListMenuButton;
 import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
+import org.chromium.components.browser_ui.widget.listmenu.ListMenuButton;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.test.util.DummyUiActivityTestCase;
 import org.chromium.ui.test.util.NightModeTestUtils;

chrome/android/junit/DEPS

@@ -3,12 +3,12 @@ include_rules = [
   "+chrome/lib/lifecycle/public",
   "+chrome/browser/image_fetcher",
   "+chrome/browser/preferences/android/java",
-  "+chrome/browser/ui/android/widget",
   "+chrome/browser/ui/messages/android/java",
   "+chrome/browser/util",
   "+components/autofill/android/java/src/org/chromium/components/autofill",
   "+components/background_task_scheduler/android",
   "+components/bookmarks/common/android",
+  "+components/browser_ui/widget/android",
   "+components/offline_items_collection/core/android/java/src",
   "+components/omnibox/browser/android/java/src/org/chromium/components/omnibox",
   "+components/payments/content/android/java/src/org/chromium/components/payments",

chrome/android/junit/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupportTest.java

@@ -29,7 +29,7 @@ import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.IPHBubbleDelegate;
 import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.PopupState;
 import org.chromium.chrome.browser.infobar.InfoBarContainerLayout.Item;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 
 /** Tests {@link IPHInfoBarSupport}. */
 @RunWith(BaseRobolectricTestRunner.class)

chrome/browser/ui/android/appmenu/DEPS

@@ -2,10 +2,10 @@ noparent = True
 include_rules = [
   "+base/android",
   "+base/test/android",
-  "+chrome/browser/ui/android/widget",
   "+chrome/lib/lifecycle/public",
   "+chrome/test/android",
   "+components/browser_ui/styles/android",
+  "+components/browser_ui/widget/android",
   "+content/public/test/android/javatests/src/org/chromium/content_public/browser",
   "+ui/android",
 ]

chrome/browser/ui/android/appmenu/internal/BUILD.gn

@@ -21,8 +21,8 @@ android_library("java") {
     "//base:base_java",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu:java_resources",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/lib/lifecycle/public/android:java",
+    "//components/browser_ui/widget/android:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//ui/android:ui_java",
@@ -37,7 +37,7 @@ android_resources("java_resources") {
   # all be accessed through the same custom_package.
   deps = [
     "//chrome/browser/ui/android/appmenu:java_resources",
-    "//chrome/browser/ui/android/widget:ui_widget_java_resources",
+    "//components/browser_ui/widget/android:java_resources",
   ]
 }
 
@@ -58,9 +58,9 @@ android_library("javatests") {
     "//base:base_java_test_support",
     "//chrome/browser/ui/android/appmenu:java",
     "//chrome/browser/ui/android/appmenu:test_support_java",
-    "//chrome/browser/ui/android/widget:test_support_java",
     "//chrome/lib/lifecycle/public/android:java",
     "//chrome/test/android:chrome_java_test_support",
+    "//components/browser_ui/widget/android:test_support_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_support_test_runner:rules_java",

chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java

@@ -40,7 +40,7 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.SysUtils;
 import org.chromium.chrome.browser.ui.appmenu.internal.R;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighter;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighter;
 import org.chromium.ui.widget.Toast;
 
 import java.util.ArrayList;

chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuAdapter.java

@@ -27,7 +27,7 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.browser.ui.appmenu.internal.R;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighter;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighter;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.interpolators.BakedBezierInterpolator;
 import org.chromium.ui.widget.ChromeImageButton;

chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuHandlerImpl.java

@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.ConfigurationChangedObserver;
 import org.chromium.chrome.browser.lifecycle.StartStopWithNativeObserver;
 import org.chromium.chrome.browser.ui.appmenu.internal.R;
-import org.chromium.chrome.browser.ui.widget.textbubble.TextBubble;
+import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
 import org.chromium.ui.display.DisplayAndroidManager;
 
 import java.util.ArrayList;

chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTest.java

@@ -29,8 +29,8 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
 import org.chromium.chrome.browser.lifecycle.LifecycleObserver;
 import org.chromium.chrome.browser.ui.appmenu.test.R;
-import org.chromium.chrome.browser.ui.widget.highlight.ViewHighlighterTestUtils;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.components.browser_ui.widget.highlight.ViewHighlighterTestUtils;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.test.util.DummyUiActivity;

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -3156,9 +3156,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_ACCESSIBILITY_CANCEL_SELECTION" desc="Content description for the cancel selection button that deselects the selected items in a selectable list view.">
         Cancel selection
       </message>
-      <message name="IDS_ACCESSIBILITY_LIST_MENU_BUTTON" desc="Content description for the button that shows option menu for a list item.">
-        <ph name="NAME_OF_LIST_ITEM">%1$s<ex>Movie Title</ex></ph> Options
-      </message>
       <message name="IDS_ACCESSIBILITY_TOOLBAR_SCREEN_POSITION" desc="Accessibility announcement to inform users about a toolbar's location.">
         <ph name="ITEM_COUNT">%1$s<ex>3</ex></ph> selected.  Options available near top of the screen
       </message>

chrome/browser/ui/android/widget/BUILD.gn

@@ -1,99 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/android/rules.gni")
-import("//ui/android/features.gni")
-
-android_library("java") {
-  sources = [
-    "java/src/org/chromium/chrome/browser/ui/widget/CompositeTouchDelegate.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/dragreorder/DragReorderableListAdapter.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/dragreorder/DragStateDelegate.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/highlight/PulseDrawable.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/highlight/PulseInterpolator.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighter.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/BasicListMenu.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenu.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuButton.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuButtonDelegate.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemAdapter.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemProperties.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemViewBinder.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/textbubble/ArrowBubbleDrawable.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/textbubble/ImageTextBubble.java",
-    "java/src/org/chromium/chrome/browser/ui/widget/textbubble/TextBubble.java",
-  ]
-
-  deps = [
-    ":ui_widget_java_resources",
-    "//base:base_java",
-    "//chrome/browser/util:java",
-    "//components/browser_ui/widget/android:java",
-    "//third_party/android_deps:android_support_v4_java",
-    "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//third_party/android_deps:com_android_support_interpolator_java",
-    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
-    "//ui/android:ui_java",
-  ]
-}
-
-android_resources("ui_widget_java_resources") {
-  custom_package = "org.chromium.chrome.browser.ui.widget"
-  resource_dirs = [ "java/res" ]
-  deps = [
-    "//chrome/browser/ui/android/strings:ui_strings_grd",
-    "//components/browser_ui/strings/android:browser_ui_strings_grd",
-    "//components/browser_ui/styles/android:java_resources",
-    "//components/browser_ui/widget/android:java_resources",
-    "//third_party/android_deps:com_android_support_design_java",
-    "//ui/android:ui_java_resources",
-  ]
-}
-
-android_library("test_support_java") {
-  testonly = true
-
-  sources = [ "test/java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighterTestUtils.java" ]
-  deps = [
-    ":java",
-    "//content/public/test/android:content_java_test_support",
-  ]
-}
-
-android_library("ui_widget_java_tests") {
-  testonly = true
-
-  sources = [ "java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighterTest.java" ]
-
-  deps = [
-    ":java",
-    ":test_support_java",
-    ":ui_widget_java_resources",
-    ":ui_widget_java_resources",
-    "//base:base_java_test_support",
-    "//chrome/browser/ui/android/strings:ui_strings_grd",
-    "//content/public/test/android:content_java_test_support",
-    "//third_party/android_deps:com_android_support_support_compat_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit",
-    "//ui/android:ui_java_resources",
-    "//ui/android:ui_java_test_support",
-  ]
-}
-
-java_library("ui_widget_junit_tests") {
-  # Skip platform checks since Robolectric depends on requires_android targets.
-  bypass_platform_checks = true
-  testonly = true
-  sources = [ "java/src/org/chromium/chrome/browser/ui/widget/CompositeTouchDelegateUnitTest.java" ]
-  deps = [
-    ":java",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//base:base_junit_test_support",
-    "//base/test:test_support_java",
-  ]
-}

chrome/browser/ui/android/widget/DEPS

@@ -1,10 +0,0 @@
-noparent = True
-
-include_rules = [
-  "+base",
-  "+chrome/browser/util/android/java",
-  "+chrome/test/android",
-  "+components/browser_ui/widget/android",
-  "+content/public/test/android/javatests/src/org/chromium/content_public/browser",
-  "+ui/android",
-]

chrome/browser/ui/android/widget/OWNERS

@@ -1,5 +0,0 @@
-twellington@chromium.org
-
-# TEAM: chrome-android-app@chromium.org
-# COMPONENT: UI>Browser>Mobile
-# OS: Android

chrome/browser/ui/android/widget/README

@@ -1,4 +0,0 @@
-Note: this directory is in the process of being migrated to
-//components/browser_ui/widget/android. Consider adding new code there instead
-of here. If your code is specific to Chrome (e.g. references tabs, omnibox,
-etc), it likely does not belong in widget.

chrome/browser/ui/android/widget/java/res/values/attrs.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2019 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<resources>
-    <declare-styleable name="ListMenuButton">
-        <attr name="menuMaxWidth" format="reference|dimension" />
-        <attr name="menuVerticalOverlapAnchor" format="boolean" />
-        <attr name="menuHorizontalOverlapAnchor" format="boolean" />
-        <attr name="menuBackground" format="reference" />
-    </declare-styleable>
-</resources>

chrome/browser/ui/android/widget/java/res/values/dimens.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2019 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<resources>
-    <dimen name="list_menu_width">180dp</dimen>
-
-    <!-- Custom Menu dimensions -->
-    <dimen name="menu_negative_software_vertical_offset">0dp</dimen>
-    <dimen name="menu_divider_padding">8dp</dimen>
-    <dimen name="menu_drawable_padding">16dp</dimen>
-    <dimen name="menu_padding_start">16dp</dimen>
-
-    <!-- Drag-Reorderable List dimensions -->
-    <dimen name="list_item_dragged_elevation">6dp</dimen>
-
-    <!-- TextBubble dimensions -->
-    <dimen name="text_bubble_margin">4dp</dimen>
-    <dimen name="text_bubble_corner_radius">8dp</dimen>
-    <dimen name="text_bubble_arrow_width">20dp</dimen>
-    <dimen name="text_bubble_arrow_height">10dp</dimen>
-    <dimen name="iph_pulse_baseline_radius">16dp</dimen>
-</resources>

chrome/browser/ui/android/widget/java/res/values/ids.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright 2019 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<resources>
-    <!-- ViewHighlighter tags -->
-    <item type="id" name="highlight_state" />
-</resources>

chrome/browser/ui/android/widget/java/res/values/styles.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2019 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-
-<resources>
-    <style name="TextAppearance.ListMenuItem">
-        <item name="android:textColor">@color/standard_mode_tint</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <!-- ListMenuButton -->
-    <style name="ListMenuItemStyle">
-        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
-        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
-    </style>
-
-    <style name="OverflowMenuAnim">
-        <item name="android:windowEnterAnimation">@anim/menu_enter</item>
-        <item name="android:windowExitAnimation">@anim/menu_exit</item>
-    </style>
-    <style name="OverflowMenuAnimBottom">
-        <item name="android:windowEnterAnimation">@anim/menu_enter_from_bottom</item>
-        <item name="android:windowExitAnimation">@anim/menu_exit_from_bottom</item>
-    </style>
-
-    <!-- Bubble styles -->
-    <style name="TextBubbleAnimation">
-        <item name="android:windowEnterAnimation">@anim/textbubble_in</item>
-        <item name="android:windowExitAnimation">@anim/textbubble_out</item>
-    </style>
-
-</resources>

chrome/browser/ui/messages/android/BUILD.gn

@@ -23,7 +23,6 @@ android_library("java") {
   deps = [
     ":java_resources",
     "//base:base_java",
-    "//chrome/browser/ui/android/widget:java",
     "//chrome/browser/util:java",
     "//components/browser_ui/styles/android:java_resources",
     "//components/browser_ui/widget/android:java",

components/browser_ui/strings/android/browser_ui_strings.grd

@@ -292,6 +292,10 @@
       <message name="IDS_MENU_ITEM_MOVE_TO_TOP" desc="Option in item menu. User can click the 'Move to top' option to move the item up to the top of its list. [CHAR-LIMIT=24]">
         Move to top
       </message>
+
+      <message name="IDS_ACCESSIBILITY_LIST_MENU_BUTTON" desc="Content description for the button that shows option menu for a list item.">
+        <ph name="NAME_OF_LIST_ITEM">%1$s<ex>Movie Title</ex></ph> Options
+      </message>
     </messages>
   </release>
 </grit>

components/browser_ui/widget/android/BUILD.gn

@@ -10,6 +10,7 @@ android_library("java") {
     "java/src/org/chromium/components/browser_ui/widget/AlwaysDismissedDialog.java",
     "java/src/org/chromium/components/browser_ui/widget/BoundedLinearLayout.java",
     "java/src/org/chromium/components/browser_ui/widget/ClipDrawableProgressBar.java",
+    "java/src/org/chromium/components/browser_ui/widget/CompositeTouchDelegate.java",
     "java/src/org/chromium/components/browser_ui/widget/ContextMenuDialog.java",
     "java/src/org/chromium/components/browser_ui/widget/DualControlLayout.java",
     "java/src/org/chromium/components/browser_ui/widget/FadingEdgeScrollView.java",
@@ -38,20 +39,37 @@ android_library("java") {
     "java/src/org/chromium/components/browser_ui/widget/displaystyle/UiConfig.java",
     "java/src/org/chromium/components/browser_ui/widget/displaystyle/VerticalDisplayStyle.java",
     "java/src/org/chromium/components/browser_ui/widget/displaystyle/ViewResizer.java",
+    "java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.java",
+    "java/src/org/chromium/components/browser_ui/widget/dragreorder/DragStateDelegate.java",
+    "java/src/org/chromium/components/browser_ui/widget/highlight/PulseDrawable.java",
+    "java/src/org/chromium/components/browser_ui/widget/highlight/PulseInterpolator.java",
+    "java/src/org/chromium/components/browser_ui/widget/highlight/ViewHighlighter.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/BasicListMenu.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenu.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButton.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButtonDelegate.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuItemAdapter.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuItemProperties.java",
+    "java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuItemViewBinder.java",
     "java/src/org/chromium/components/browser_ui/widget/text/AccessibleTextView.java",
     "java/src/org/chromium/components/browser_ui/widget/text/AlertDialogEditText.java",
     "java/src/org/chromium/components/browser_ui/widget/text/ChromeTextInputLayout.java",
     "java/src/org/chromium/components/browser_ui/widget/text/TemplatePreservingTextView.java",
     "java/src/org/chromium/components/browser_ui/widget/text/TextViewWithCompoundDrawables.java",
     "java/src/org/chromium/components/browser_ui/widget/text/VerticallyFixedEditText.java",
+    "java/src/org/chromium/components/browser_ui/widget/textbubble/ArrowBubbleDrawable.java",
+    "java/src/org/chromium/components/browser_ui/widget/textbubble/ImageTextBubble.java",
+    "java/src/org/chromium/components/browser_ui/widget/textbubble/TextBubble.java",
   ]
 
   deps = [
     ":java_resources",
     "//base:base_java",
+    "//third_party/android_deps:android_support_v4_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_interpolator_java",
+    "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//ui/android:ui_java",
   ]
 }
@@ -62,10 +80,21 @@ android_resources("java_resources") {
   deps = [
     "//components/browser_ui/strings/android:browser_ui_strings_grd",
     "//components/browser_ui/styles/android:java_resources",
+    "//third_party/android_deps:com_android_support_design_java",
     "//ui/android:ui_java_resources",
   ]
 }
 
+android_library("test_support_java") {
+  testonly = true
+
+  sources = [ "test/java/src/org/chromium/components/browser_ui/widget/highlight/ViewHighlighterTestUtils.java" ]
+  deps = [
+    ":java",
+    "//content/public/test/android:content_java_test_support",
+  ]
+}
+
 android_library("javatests") {
   testonly = true
 
@@ -78,12 +107,14 @@ android_library("javatests") {
     "java/src/org/chromium/components/browser_ui/widget/RadioButtonWithDescriptionLayoutTest.java",
     "java/src/org/chromium/components/browser_ui/widget/RadioButtonWithEditTextTest.java",
     "java/src/org/chromium/components/browser_ui/widget/WrappingLayoutTest.java",
+    "java/src/org/chromium/components/browser_ui/widget/highlight/ViewHighlighterTest.java",
     "java/src/org/chromium/components/browser_ui/widget/text/ChromeTextInputLayoutRenderTest.java",
   ]
   deps = [
     ":java",
     ":java_resources",
     ":java_test_resources",
+    ":test_support_java",
     "//base:base_java_test_support",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:com_android_support_appcompat_v7_java",
@@ -106,3 +137,17 @@ android_resources("java_test_resources") {
     "//ui/android:ui_java_resources",
   ]
 }
+
+java_library("junit") {
+  # Skip platform checks since Robolectric depends on requires_android targets.
+  bypass_platform_checks = true
+  testonly = true
+  sources = [ "java/src/org/chromium/components/browser_ui/widget/CompositeTouchDelegateUnitTest.java" ]
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//base:base_junit_test_support",
+    "//base/test:test_support_java",
+  ]
+}

components/browser_ui/widget/android/OWNERS

@@ -1 +1,5 @@
 twellington@chromium.org
+
+# TEAM: chrome-android-app@chromium.org
+# COMPONENT: UI>Browser>Mobile
+# OS: Android

components/browser_ui/widget/android/README

@@ -1,5 +1,2 @@
 The org.chromium.components.browser_ui.widget package contains generally useful
 UI utilities with no feature-specific code or dependencies.
-
-TODO(crbug.com/1030785): Most or all of org.chromium.chrome.browser.ui.widget
-should be relocated to this package.

components/browser_ui/widget/android/java/res/values/attrs.xml

@@ -29,12 +29,20 @@
         <attr name="dualControlLayoutHorizontalPadding" format="dimension"/>
     </declare-styleable>
 
+    <declare-styleable name="ListMenuButton">
+        <attr name="menuMaxWidth" format="reference|dimension" />
+        <attr name="menuVerticalOverlapAnchor" format="boolean" />
+        <attr name="menuHorizontalOverlapAnchor" format="boolean" />
+        <attr name="menuBackground" format="reference" />
+    </declare-styleable>
+
     <declare-styleable name="MaterialProgressBar">
         <attr name="colorBackground" format="reference|color" />
         <attr name="colorProgress" format="reference|color" />
         <attr name="colorSecondaryProgress" format="reference|color" />
     </declare-styleable>
 
+
     <declare-styleable name="PaddedFrameLayout">
         <attr name="maxChildWidth" format="dimension" />
         <attr name="maxChildHeight" format="dimension" />

components/browser_ui/widget/android/java/res/values/dimens.xml

@@ -26,4 +26,22 @@
 
     <!-- RadioButton(WithDescription)Layout dimensions -->
     <dimen name="default_vertical_margin_between_items">8dp</dimen>
+
+    <dimen name="list_menu_width">180dp</dimen>
+
+    <!-- Custom Menu dimensions -->
+    <dimen name="menu_negative_software_vertical_offset">0dp</dimen>
+    <dimen name="menu_divider_padding">8dp</dimen>
+    <dimen name="menu_drawable_padding">16dp</dimen>
+    <dimen name="menu_padding_start">16dp</dimen>
+
+    <!-- Drag-Reorderable List dimensions -->
+    <dimen name="list_item_dragged_elevation">6dp</dimen>
+
+    <!-- TextBubble dimensions -->
+    <dimen name="text_bubble_margin">4dp</dimen>
+    <dimen name="text_bubble_corner_radius">8dp</dimen>
+    <dimen name="text_bubble_arrow_width">20dp</dimen>
+    <dimen name="text_bubble_arrow_height">10dp</dimen>
+    <dimen name="iph_pulse_baseline_radius">16dp</dimen>
 </resources>

components/browser_ui/widget/android/java/res/values/ids.xml

@@ -8,4 +8,7 @@
     <!-- DualControlLayout button ids -->
     <item type="id" name="button_primary" />
     <item type="id" name="button_secondary" />
+
+    <!-- ViewHighlighter tags -->
+    <item type="id" name="highlight_state" />
 </resources>

components/browser_ui/widget/android/java/res/values/styles.xml

@@ -8,6 +8,27 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
+    <style name="TextAppearance.ListMenuItem">
+        <item name="android:textColor">@color/standard_mode_tint</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <!-- ListMenuButton -->
+    <style name="ListMenuItemStyle">
+        <item name="android:paddingStart">?android:attr/listPreferredItemPaddingStart</item>
+        <item name="android:paddingEnd">?android:attr/listPreferredItemPaddingEnd</item>
+    </style>
+
+    <style name="OverflowMenuAnim">
+        <item name="android:windowEnterAnimation">@anim/menu_enter</item>
+        <item name="android:windowExitAnimation">@anim/menu_exit</item>
+    </style>
+    <style name="OverflowMenuAnimBottom">
+        <item name="android:windowEnterAnimation">@anim/menu_enter_from_bottom</item>
+        <item name="android:windowExitAnimation">@anim/menu_exit_from_bottom</item>
+    </style>
+
+
     <!-- Promo dialogs -->
     <style name="PromoDialog" >
         <item name="android:background">@android:color/transparent</item>
@@ -24,4 +45,11 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
     </style>
+
+    <!-- Bubble styles -->
+    <style name="TextBubbleAnimation">
+        <item name="android:windowEnterAnimation">@anim/textbubble_in</item>
+        <item name="android:windowExitAnimation">@anim/textbubble_out</item>
+    </style>
+
 </resources>

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/CompositeTouchDelegate.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.chrome.browser.ui.widget;
+package org.chromium.components.browser_ui.widget;
 
 import android.graphics.Rect;
 import android.view.MotionEvent;

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/CompositeTouchDelegateUnitTest.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.chrome.browser.ui.widget;
+package org.chromium.components.browser_ui.widget;
 
 import android.view.MotionEvent;
 import android.view.TouchDelegate;

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragReorderableListAdapter.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.chrome.browser.ui.widget.dragreorder;
+package org.chromium.components.browser_ui.widget.dragreorder;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -18,7 +18,7 @@ import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ObserverList;
-import org.chromium.chrome.browser.ui.widget.R;
+import org.chromium.components.browser_ui.widget.R;
 
 import java.util.Collections;
 import java.util.List;

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/dragreorder/DragStateDelegate.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.chrome.browser.ui.widget.dragreorder;
+package org.chromium.components.browser_ui.widget.dragreorder;
 
 import androidx.annotation.VisibleForTesting;
 

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/highlight/PulseDrawable.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.chrome.browser.ui.widget.highlight;
+package org.chromium.components.browser_ui.widget.highlight;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,7 +22,7 @@ import androidx.annotation.NonNull;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.MathUtils;
-import org.chromium.chrome.browser.ui.widget.R;
+import org.chromium.components.browser_ui.widget.R;
 import org.chromium.components.browser_ui.widget.animation.Interpolators;
 
 /**

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/highlight/PulseInterpolator.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.chrome.browser.ui.widget.highlight;
+package org.chromium.components.browser_ui.widget.highlight;
 
 import android.view.animation.Interpolator;
 

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/highlight/ViewHighlighter.java

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.ui.widget.highlight;
+package org.chromium.components.browser_ui.widget.highlight;
 
-import static org.chromium.chrome.browser.ui.widget.highlight.PulseDrawable.createCircle;
+import static org.chromium.components.browser_ui.widget.highlight.PulseDrawable.createCircle;
 
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -13,7 +13,7 @@ import android.view.View;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
-import org.chromium.chrome.browser.ui.widget.R;
+import org.chromium.components.browser_ui.widget.R;
 
 /**
  * A helper class to draw an overlay layer on the top of a view to enable highlighting. The overlay

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/highlight/ViewHighlighterTest.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.chrome.browser.ui.widget.highlight;
+package org.chromium.components.browser_ui.widget.highlight;
 
 import android.content.Context;
 import android.graphics.Color;

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/BasicListMenu.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.chrome.browser.ui.widget.listmenu;
+package org.chromium.components.browser_ui.widget.listmenu;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -17,7 +17,7 @@ import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 
-import org.chromium.chrome.browser.ui.widget.R;
+import org.chromium.components.browser_ui.widget.R;
 import org.chromium.ui.modelutil.MVCListAdapter.ListItem;
 import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
 import org.chromium.ui.modelutil.ModelListAdapter;

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenu.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.chrome.browser.ui.widget.listmenu;
+package org.chromium.components.browser_ui.widget.listmenu;
 
 import android.view.View;
 

components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuButton.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.chrome.browser.ui.widget.listmenu;
+package org.chromium.components.browser_ui.widget.listmenu;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -12,7 +12,7 @@ import android.util.AttributeSet;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ObserverList;
-import org.chromium.chrome.browser.ui.widget.R;
+import org.chromium.components.browser_ui.widget.R;
 import org.chromium.ui.widget.AnchoredPopupWindow;
 import org.chromium.ui.widget.ChromeImageButton;