Commit 44ae9532 authored by Kyle Milka's avatar Kyle Milka Committed by Commit Bot

Remove some unneeded DEPS from c/b/share/

c/a/j/...Tab.java no longer exists.

MediaViewerUtils is no longer used by share/ code.

ApiCompatibilityUtils can be used to check for multiwindow mode.

Bug: 1022172
Change-Id: I977e8764d7137071b5767c15a5e999926ab24b82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472261Reviewed-by: default avatarJeffrey Cohen <jeffreycohen@chromium.org>
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820020}
parent d87d46b8
...@@ -9,14 +9,11 @@ include_rules = [ ...@@ -9,14 +9,11 @@ include_rules = [
"+chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java",
"+chrome/android/java/src/org/chromium/chrome/browser/download/DownloadController.java", "+chrome/android/java/src/org/chromium/chrome/browser/download/DownloadController.java",
"+chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java", "+chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java",
"+chrome/android/java/src/org/chromium/chrome/browser/media/MediaViewerUtils.java",
"+chrome/android/java/src/org/chromium/chrome/browser/modules/ModuleInstallUi.java", "+chrome/android/java/src/org/chromium/chrome/browser/modules/ModuleInstallUi.java",
"+chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java",
"+chrome/android/java/src/org/chromium/chrome/browser/notifications", "+chrome/android/java/src/org/chromium/chrome/browser/notifications",
"+chrome/android/java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotSource.java", "+chrome/android/java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotSource.java",
"+chrome/android/java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java", "+chrome/android/java/src/org/chromium/chrome/browser/screenshot/EditorScreenshotTask.java",
"+chrome/android/java/src/org/chromium/chrome/browser/share", "+chrome/android/java/src/org/chromium/chrome/browser/share",
"+chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java",
"+chrome/services/qrcode_generator", "+chrome/services/qrcode_generator",
"+components/browser_ui/notifications/android", "+components/browser_ui/notifications/android",
"+components/browser_ui/share/android", "+components/browser_ui/share/android",
......
...@@ -11,6 +11,7 @@ import android.view.View; ...@@ -11,6 +11,7 @@ import android.view.View;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.appcompat.content.res.AppCompatResources; import androidx.appcompat.content.res.AppCompatResources;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.metrics.RecordUserAction; import org.chromium.base.metrics.RecordUserAction;
...@@ -18,7 +19,6 @@ import org.chromium.base.supplier.Supplier; ...@@ -18,7 +19,6 @@ import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.lifecycle.ConfigurationChangedObserver; import org.chromium.chrome.browser.lifecycle.ConfigurationChangedObserver;
import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
import org.chromium.chrome.browser.settings.SettingsLauncher; import org.chromium.chrome.browser.settings.SettingsLauncher;
import org.chromium.chrome.browser.share.ChromeShareExtras; import org.chromium.chrome.browser.share.ChromeShareExtras;
import org.chromium.chrome.browser.share.ShareHelper; import org.chromium.chrome.browser.share.ShareHelper;
...@@ -169,7 +169,7 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio ...@@ -169,7 +169,7 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
mChromeProvidedSharingOptionsProvider = new ChromeProvidedSharingOptionsProvider(activity, mChromeProvidedSharingOptionsProvider = new ChromeProvidedSharingOptionsProvider(activity,
mTabProvider, mBottomSheetController, mBottomSheet, shareParams, chromeShareExtras, mTabProvider, mBottomSheetController, mBottomSheet, shareParams, chromeShareExtras,
mPrintTabCallback, mSettingsLauncher, mIsSyncEnabled, mShareStartTime, this); mPrintTabCallback, mSettingsLauncher, mIsSyncEnabled, mShareStartTime, this);
mIsMultiWindow = MultiWindowUtils.getInstance().isInMultiWindowMode(activity); mIsMultiWindow = ApiCompatibilityUtils.isInMultiWindowMode(activity);
return mChromeProvidedSharingOptionsProvider.getPropertyModels( return mChromeProvidedSharingOptionsProvider.getPropertyModels(
contentTypes, mIsMultiWindow); contentTypes, mIsMultiWindow);
...@@ -217,7 +217,7 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio ...@@ -217,7 +217,7 @@ public class ShareSheetCoordinator implements ActivityStateObserver, ChromeOptio
if (mActivity == null) { if (mActivity == null) {
return; return;
} }
boolean isMultiWindow = MultiWindowUtils.getInstance().isInMultiWindowMode(mActivity); boolean isMultiWindow = ApiCompatibilityUtils.isInMultiWindowMode(mActivity);
// mContentTypes is null if Chrome features should not be shown. // mContentTypes is null if Chrome features should not be shown.
if (mIsMultiWindow == isMultiWindow || mContentTypes == null) { if (mIsMultiWindow == isMultiWindow || mContentTypes == null) {
return; return;
......
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