Commit 2af9b000 authored by Theresa Wellington's avatar Theresa Wellington Committed by Commit Bot

Move three classes to components/browser_ui/widget/

Move the following classes to components/browser_ui/widget/
 - FeatureHighlightProvider
 - InsetObserverView
 - MenuOrKeyboardActionController

BUG=951455,1010176

Change-Id: I7eac449f45b52f243fea468554b2a9f6c4868d32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040002
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: default avatarMatthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738708}
parent 7c602a3c
......@@ -37,14 +37,12 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/DeviceConditions.java",
"java/src/org/chromium/chrome/browser/FileProviderHelper.java",
"java/src/org/chromium/chrome/browser/GlobalDiscardableReferencePool.java",
"java/src/org/chromium/chrome/browser/InsetObserverView.java",
"java/src/org/chromium/chrome/browser/IntentHandler.java",
"java/src/org/chromium/chrome/browser/IntentHeadersRecorder.java",
"java/src/org/chromium/chrome/browser/IntentHelper.java",
"java/src/org/chromium/chrome/browser/KeyboardShortcuts.java",
"java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java",
"java/src/org/chromium/chrome/browser/LauncherShortcutActivity.java",
"java/src/org/chromium/chrome/browser/MenuOrKeyboardActionController.java",
"java/src/org/chromium/chrome/browser/NavigationPopup.java",
"java/src/org/chromium/chrome/browser/NearOomMonitor.java",
"java/src/org/chromium/chrome/browser/PowerBroadcastReceiver.java",
......@@ -1866,7 +1864,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
"java/src/org/chromium/chrome/browser/webshare/SharedFileCollator.java",
"java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java",
"java/src/org/chromium/chrome/browser/widget/FeatureHighlightProvider.java",
"java/src/org/chromium/chrome/browser/widget/ScrimView.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java",
"java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetContent.java",
......
......@@ -3,7 +3,6 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/ChromeActionModeCallbackTest.java",
"junit/src/org/chromium/chrome/browser/ChromeBackupAgentTest.java",
"junit/src/org/chromium/chrome/browser/DelayedScreenLockIntentHandlerTest.java",
"junit/src/org/chromium/chrome/browser/InsetObserverViewTest.java",
"junit/src/org/chromium/chrome/browser/IntentHeadersRecorderTest.java",
"junit/src/org/chromium/chrome/browser/SSLClientCertificateRequestTest.java",
"junit/src/org/chromium/chrome/browser/ShadowDeviceConditions.java",
......
......@@ -66,6 +66,7 @@ android_library("test_java") {
"//components/autofill/android:autofill_java",
"//components/autofill/core/common/mojom:mojo_types_java",
"//components/browser_ui/modaldialog/android:java",
"//components/browser_ui/widget/android:java",
"//components/feature_engagement/public:public_java",
"//content/public/android:content_java",
"//content/public/test/android:content_java_test_support",
......
......@@ -30,7 +30,6 @@ import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
import org.chromium.chrome.browser.ChromeWindow;
import org.chromium.chrome.browser.InsetObserverView;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.compositor.CompositorViewResizer;
import org.chromium.chrome.browser.compositor.layouts.Layout;
......@@ -64,6 +63,7 @@ import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetObserver;
import org.chromium.chrome.browser.widget.bottomsheet.EmptyBottomSheetObserver;
import org.chromium.components.autofill.AutofillDelegate;
import org.chromium.components.autofill.AutofillSuggestion;
import org.chromium.components.browser_ui.widget.InsetObserverView;
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.DropdownPopupWindow;
import org.chromium.ui.base.WindowAndroid;
......
......@@ -13,7 +13,7 @@ import android.view.ViewGroup;
import org.chromium.chrome.browser.ChromeKeyboardVisibilityDelegate;
import org.chromium.chrome.browser.ChromeWindow;
import org.chromium.chrome.browser.InsetObserverView;
import org.chromium.components.browser_ui.widget.InsetObserverView;
import java.lang.ref.WeakReference;
......
......@@ -21,7 +21,6 @@ import org.chromium.base.Callback;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.MenuOrKeyboardActionController;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
......@@ -36,6 +35,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tasks.tab_management.suggestions.TabSuggestionsOrchestrator;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.tab_ui.R;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
......
......@@ -56,7 +56,7 @@ import org.chromium.chrome.browser.ui.ImmersiveModeManager;
import org.chromium.chrome.browser.usage_stats.DigitalWellbeingClient;
import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
import org.chromium.chrome.browser.webauth.Fido2ApiHandler;
import org.chromium.chrome.browser.widget.FeatureHighlightProvider;
import org.chromium.components.browser_ui.widget.FeatureHighlightProvider;
import org.chromium.components.download.DownloadCollectionBridge;
import org.chromium.components.signin.AccountManagerDelegate;
import org.chromium.components.signin.SystemAccountManagerDelegate;
......
......@@ -162,6 +162,8 @@ 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.InsetObserverView;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import org.chromium.components.browser_ui.widget.textbubble.TextBubble;
import org.chromium.components.feature_engagement.EventConstants;
import org.chromium.components.feature_engagement.Tracker;
......
......@@ -38,7 +38,6 @@ import org.chromium.base.TraceEvent;
import org.chromium.base.compat.ApiHelperForN;
import org.chromium.base.compat.ApiHelperForO;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.InsetObserverView;
import org.chromium.chrome.browser.compositor.Invalidator.Client;
import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerHost;
......@@ -59,6 +58,7 @@ import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.toolbar.ControlContainer;
import org.chromium.chrome.browser.toolbar.ToolbarColors;
import org.chromium.components.browser_ui.widget.InsetObserverView;
import org.chromium.components.content_capture.ContentCaptureConsumer;
import org.chromium.components.content_capture.ContentCaptureConsumerImpl;
import org.chromium.content_public.browser.WebContents;
......
......@@ -13,7 +13,6 @@ import androidx.annotation.Nullable;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.AppHooks;
import org.chromium.chrome.browser.MenuOrKeyboardActionController;
import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantFacade;
import org.chromium.chrome.browser.findinpage.FindToolbarManager;
import org.chromium.chrome.browser.flags.ActivityType;
......@@ -22,6 +21,7 @@ import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.widget.ScrimView;
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import java.util.function.Consumer;
......
......@@ -10,9 +10,9 @@ import androidx.annotation.Nullable;
import org.chromium.base.Callback;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.MenuOrKeyboardActionController;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import java.util.Collections;
import java.util.HashMap;
......
......@@ -14,12 +14,12 @@ import org.chromium.base.UserData;
import org.chromium.base.UserDataHost;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.blink.mojom.ViewportFit;
import org.chromium.chrome.browser.InsetObserverView;
import org.chromium.chrome.browser.tab.EmptyTabObserver;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabImpl;
import org.chromium.chrome.browser.tab.TabObserver;
import org.chromium.chrome.browser.tab.TabSelectionType;
import org.chromium.components.browser_ui.widget.InsetObserverView;
import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.browser.WebContentsObserver;
......
......@@ -13,7 +13,6 @@ import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.ActivityTabProvider.ActivityTabTabObserver;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.InsetObserverView;
import org.chromium.chrome.browser.SwipeRefreshHandler;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
......@@ -23,6 +22,7 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabImpl;
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.widget.InsetObserverView;
import org.chromium.content_public.browser.WebContents;
/**
......
......@@ -20,7 +20,6 @@ import org.chromium.base.ApplicationStatus;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.MenuOrKeyboardActionController;
import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.lifecycle.Destroyable;
......@@ -30,6 +29,7 @@ import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab_activity_glue.ReparentingTask;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.util.AndroidTaskUtils;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import java.util.List;
......
......@@ -19,7 +19,7 @@ import org.chromium.chrome.browser.ThemeColorProvider;
import org.chromium.chrome.browser.ThemeColorProvider.ThemeColorObserver;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.widget.FeatureHighlightProvider;
import org.chromium.components.browser_ui.widget.FeatureHighlightProvider;
import org.chromium.components.feature_engagement.FeatureConstants;
import org.chromium.components.feature_engagement.Tracker;
......
......@@ -20,7 +20,6 @@ import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.MenuOrKeyboardActionController;
import org.chromium.chrome.browser.TabThemeColorProvider;
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
......@@ -46,6 +45,7 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.vr.VrModuleProvider;
import org.chromium.chrome.browser.widget.ScrimView;
import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
import org.chromium.components.browser_ui.widget.MenuOrKeyboardActionController;
import org.chromium.components.paintpreview.browser.PaintPreviewUtils;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.modaldialog.ModalDialogManager.ModalDialogManagerObserver;
......
......@@ -24,10 +24,10 @@ import org.robolectric.annotation.Config;
import org.chromium.blink.mojom.ViewportFit;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.InsetObserverView;
import org.chromium.chrome.browser.tab.TabImpl;
import org.chromium.chrome.browser.tab.TabObserver;
import org.chromium.chrome.browser.tab.TabSelectionType;
import org.chromium.components.browser_ui.widget.InsetObserverView;
import org.chromium.testing.local.LocalRobolectricTestRunner;
/**
......
......@@ -15,8 +15,11 @@ android_library("java") {
"java/src/org/chromium/components/browser_ui/widget/FadingEdgeScrollView.java",
"java/src/org/chromium/components/browser_ui/widget/FadingShadow.java",
"java/src/org/chromium/components/browser_ui/widget/FadingShadowView.java",
"java/src/org/chromium/components/browser_ui/widget/FeatureHighlightProvider.java",
"java/src/org/chromium/components/browser_ui/widget/InsetObserverView.java",
"java/src/org/chromium/components/browser_ui/widget/LoadingView.java",
"java/src/org/chromium/components/browser_ui/widget/MaterialProgressBar.java",
"java/src/org/chromium/components/browser_ui/widget/MenuOrKeyboardActionController.java",
"java/src/org/chromium/components/browser_ui/widget/MoreProgressButton.java",
"java/src/org/chromium/components/browser_ui/widget/NumberRollView.java",
"java/src/org/chromium/components/browser_ui/widget/PaddedFrameLayout.java",
......@@ -150,6 +153,7 @@ java_library("junit") {
testonly = true
sources = [
"java/src/org/chromium/components/browser_ui/widget/CompositeTouchDelegateUnitTest.java",
"java/src/org/chromium/components/browser_ui/widget/InsetObserverViewTest.java",
"java/src/org/chromium/components/browser_ui/widget/selectable_list/SelectionDelegateTest.java",
]
deps = [
......
......@@ -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.widget;
package org.chromium.components.browser_ui.widget;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
......
......@@ -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;
package org.chromium.components.browser_ui.widget;
import android.annotation.TargetApi;
import android.content.Context;
......@@ -195,8 +195,9 @@ public class InsetObserverView extends View {
// If the safe area has not changed then we should stop now.
if (mCurrentSafeArea.left == left && mCurrentSafeArea.top == top
&& mCurrentSafeArea.right == right && mCurrentSafeArea.bottom == bottom)
&& mCurrentSafeArea.right == right && mCurrentSafeArea.bottom == bottom) {
return;
}
mCurrentSafeArea.set(left, top, right, bottom);
......
......@@ -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;
package org.chromium.components.browser_ui.widget;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.never;
......
......@@ -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;
package org.chromium.components.browser_ui.widget;
/**
* A controller to register/unregister {@link MenuOrKeyboardActionHandler} for menu or keyboard
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment