Build fixes
This commit is contained in:
csagan5
wuyifeng
parent
347580d236
commit
c126b7a189
21 changed files with 235 additions and 216 deletions
|
|
@ -112,7 +112,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/ActivityUtils.java",
|
||||
@@ -915,6 +916,7 @@ chrome_java_sources = [
|
||||
@@ -914,6 +915,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
|
||||
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
|
||||
|
|
@ -655,7 +655,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
|
|||
+ Uri.parse(tab.getUrl().getSpec()));
|
||||
+ intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());
|
||||
+ if (windowDisposition != WindowOpenDisposition.CURRENT_TAB) {
|
||||
+ intent.putExtra(Browser.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
|
||||
+ intent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);
|
||||
+ }
|
||||
+ intent.setPackage(context.getPackageName());
|
||||
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
||||
@@ -37,6 +37,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
|
||||
@@ -36,6 +36,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;
|
||||
import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
|
||||
import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
|
||||
import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate;
|
||||
|
|
@ -574,7 +574,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
|
||||
import org.chromium.components.favicon.LargeIconBridge;
|
||||
import org.chromium.url.GURL;
|
||||
@@ -60,6 +62,8 @@ public class BookmarkManager
|
||||
@@ -59,6 +61,8 @@ public class BookmarkManager
|
||||
private ComponentName mOpenBookmarkComponentName;
|
||||
private ViewGroup mMainView;
|
||||
private BookmarkModel mBookmarkModel;
|
||||
|
|
@ -583,7 +583,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
private BookmarkUndoController mUndoController;
|
||||
private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
|
||||
private BasicNativePage mNativePage;
|
||||
@@ -345,6 +349,14 @@ public class BookmarkManager
|
||||
@@ -344,6 +348,14 @@ public class BookmarkManager
|
||||
mNativePage = nativePage;
|
||||
}
|
||||
|
||||
|
|
@ -598,7 +598,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
/**
|
||||
* @return Current URL representing the UI state of bookmark manager. If no state has been shown
|
||||
* yet in this session, on phone return last used state stored in preference; on tablet
|
||||
@@ -541,6 +553,16 @@ public class BookmarkManager
|
||||
@@ -540,6 +552,16 @@ public class BookmarkManager
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -7463,6 +7463,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
@@ -7467,6 +7467,10 @@ const FeatureEntry kFeatureEntries[] = {
|
||||
FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},
|
||||
#endif
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
|||
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -6458,6 +6458,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
|
||||
@@ -6463,6 +6463,9 @@ extern const char kLacrosScreenCoordinatesDescription[];
|
||||
|
||||
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
|
|||
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -3935,6 +3935,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
|
||||
@@ -3938,6 +3938,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];
|
||||
extern const char kWebUITabStripTabDragIntegrationDescription[];
|
||||
#endif // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ Subject: Add menu item to bookmark all tabs
|
|||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
chrome/android/java/res/menu/main_menu.xml | 7 +++
|
||||
.../chrome/browser/ChromeTabbedActivity.java | 26 ++++++++
|
||||
.../browser/bookmarks/BookmarkBridge.java | 60 +++++++++++++++++++
|
||||
.../chrome/browser/ChromeTabbedActivity.java | 24 ++++++++
|
||||
.../browser/bookmarks/BookmarkBridge.java | 61 +++++++++++++++++++
|
||||
.../browser/bookmarks/BookmarkUtils.java | 4 ++
|
||||
.../bookmarks/android/bookmark_bridge.cc | 17 ++++++
|
||||
.../bookmarks/android/bookmark_bridge.h | 4 ++
|
||||
|
|
@ -25,7 +25,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
components/bookmarks/browser/bookmark_node.h | 5 ++
|
||||
components/bookmarks/browser/model_loader.cc | 3 +-
|
||||
.../bookmark_specifics_conversions.cc | 1 +
|
||||
21 files changed, 202 insertions(+), 10 deletions(-)
|
||||
21 files changed, 201 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
|
||||
--- a/chrome/android/java/res/menu/main_menu.xml
|
||||
|
|
@ -54,16 +54,15 @@ diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/re
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
|
||||
@@ -77,6 +77,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
|
||||
@@ -77,6 +77,7 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan
|
||||
import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
|
||||
import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
|
||||
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
|
||||
+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
|
||||
+import org.chromium.chrome.browser.bookmarks.BookmarkModel;
|
||||
import org.chromium.chrome.browser.compositor.layouts.Layout;
|
||||
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
|
||||
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;
|
||||
@@ -2203,6 +2205,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
||||
@@ -2203,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
||||
CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
|
||||
() -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);
|
||||
RecordUserAction.record("MobileMenuCloseAllTabs");
|
||||
|
|
@ -72,7 +71,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
|||
} else if (id == R.id.close_all_incognito_tabs_menu_id) {
|
||||
// Close only incognito tabs
|
||||
CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),
|
||||
@@ -2255,6 +2259,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
||||
@@ -2255,6 +2258,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
|
||||
mTabModalHandler.onOmniboxFocusChanged(hasFocus);
|
||||
}
|
||||
|
||||
|
|
@ -84,17 +83,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
|
|||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ final BookmarkBridge bridge = mBookmarkBridgeSupplier.get();
|
||||
+ final BookmarkModel bookmarkModel = new BookmarkModel();
|
||||
+ final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get();
|
||||
+ bookmarkModel.finishLoadingBookmarkModel(() -> {
|
||||
+ for (int i = 0; i < tabModel.getCount(); i++) {
|
||||
+ Tab tab = tabModel.getTabAt(i);
|
||||
+ if (tab.isNativePage()) {
|
||||
+ continue;
|
||||
+ }
|
||||
+ bridge.addToTabsCollection(this, tab);
|
||||
+ bookmarkModel.addToTabsCollection(this, tab);
|
||||
+ }
|
||||
+ bridge.finishedAddingToTabsCollection(this, getSnackbarManager());
|
||||
+ bookmarkModel.finishedAddingToTabsCollection(this, getSnackbarManager());
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
|
|
@ -123,15 +121,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
import org.chromium.components.bookmarks.BookmarkId;
|
||||
import org.chromium.components.bookmarks.BookmarkItem;
|
||||
import org.chromium.components.bookmarks.BookmarkType;
|
||||
@@ -87,6 +92,7 @@ import java.io.File;
|
||||
@@ -86,6 +91,8 @@ import java.io.File;
|
||||
* bookmark model stored in native.
|
||||
*/
|
||||
class BookmarkBridge {
|
||||
private final Profile mProfile;
|
||||
+ private static final String TAG = "BookmarkBridge";
|
||||
+
|
||||
private final Profile mProfile;
|
||||
private boolean mIsDestroyed;
|
||||
private boolean mIsDoingExtensiveChanges;
|
||||
private long mNativeBookmarkBridge;
|
||||
@@ -393,6 +399,16 @@ class BookmarkBridge {
|
||||
@@ -393,6 +400,16 @@ class BookmarkBridge {
|
||||
mNativeBookmarkBridge, BookmarkBridge.this);
|
||||
}
|
||||
|
||||
|
|
@ -148,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
/**
|
||||
* @return Id representing the special "other" folder from bookmark model.
|
||||
*/
|
||||
@@ -1030,6 +1046,49 @@ class BookmarkBridge {
|
||||
@@ -1030,6 +1047,49 @@ class BookmarkBridge {
|
||||
mNativeBookmarkBridge, BookmarkBridge.this, title, url);
|
||||
}
|
||||
|
||||
|
|
@ -198,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
/**
|
||||
* @param url The URL of the reading list item.
|
||||
* @return The reading list item with the URL, or null if no such reading list item.
|
||||
@@ -1327,6 +1386,7 @@ class BookmarkBridge {
|
||||
@@ -1327,6 +1387,7 @@ class BookmarkBridge {
|
||||
void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
|
||||
List<BookmarkId> folderList, List<Integer> depthList);
|
||||
BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
|
||||
|
|
@ -496,7 +495,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.h b/components/bookmark
|
|||
base::Value Encode(
|
||||
const BookmarkNode* bookmark_bar_node,
|
||||
const BookmarkNode* other_folder_node,
|
||||
+ const BookmarkNode* tabs_folder_node,
|
||||
+ const BookmarkNode* tabs_folder_node,
|
||||
const BookmarkNode* mobile_folder_node,
|
||||
const BookmarkNode::MetaInfoMap* model_meta_info_map,
|
||||
const BookmarkNode::MetaInfoMap* model_unsynced_meta_info_map,
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -908,6 +908,8 @@ chrome_java_sources = [
|
||||
@@ -907,6 +907,8 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
|
||||
"java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -814,6 +814,9 @@ chrome_java_sources = [
|
||||
@@ -813,6 +813,9 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/omaha/UpdateConfigs.java",
|
||||
"java/src/org/chromium/chrome/browser/omaha/UpdateMenuItemHelper.java",
|
||||
"java/src/org/chromium/chrome/browser/omaha/UpdateStatusProvider.java",
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
|
||||
@@ -358,14 +358,6 @@ public class ProcessInitializationHandler {
|
||||
@@ -359,14 +359,6 @@ public class ProcessInitializationHandler {
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
|
|||
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
|
||||
--- a/chrome/browser/flags/android/chrome_feature_list.cc
|
||||
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
|
||||
@@ -746,8 +746,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
|
||||
@@ -750,8 +750,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
BASE_FEATURE(kExperimentsForAgsa,
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -947,7 +947,6 @@ chrome_java_sources = [
|
||||
@@ -946,7 +946,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
@@ -100,7 +100,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
|
||||
@@ -99,7 +99,6 @@ import org.chromium.chrome.browser.share.ShareButtonController;
|
||||
import org.chromium.chrome.browser.share.ShareDelegate;
|
||||
import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
|
||||
import org.chromium.chrome.browser.share.ShareUtils;
|
||||
|
|
@ -22,7 +22,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
|
||||
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
|
||||
import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
|
||||
@@ -499,10 +498,6 @@ public class RootUiCoordinator
|
||||
@@ -498,10 +497,6 @@ public class RootUiCoordinator
|
||||
}
|
||||
|
||||
public void onAttachFragment(Fragment fragment) {
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
||||
Date: Tue, 25 May 2021 19:33:41 +0200
|
||||
Subject: Enable IntentBlockExternalFormRedirectsNoGesture
|
||||
|
||||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
.../external_intents/android/external_intents_features.cc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
|
||||
--- a/components/external_intents/android/external_intents_features.cc
|
||||
+++ b/components/external_intents/android/external_intents_features.cc
|
||||
@@ -43,7 +43,7 @@ BASE_FEATURE(kExternalNavigationDebugLogs,
|
||||
|
||||
const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
|
||||
"IntentBlockExternalFormRedirectsNoGesture",
|
||||
- base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
+ base::FEATURE_ENABLED_BY_DEFAULT};
|
||||
|
||||
static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
|
||||
return reinterpret_cast<jlong>(kFeaturesExposedToJava[ordinal]);
|
||||
--
|
||||
2.25.1
|
||||
|
|
@ -41,7 +41,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -972,6 +972,7 @@ chrome_java_sources = [
|
||||
@@ -970,6 +970,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
|
||||
"java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
|
||||
|
|
@ -176,7 +176,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
|
|||
import org.chromium.chrome.browser.usb.UsbNotificationManager;
|
||||
import org.chromium.chrome.browser.util.AfterStartupTaskUtils;
|
||||
import org.chromium.chrome.browser.webapps.WebappRegistry;
|
||||
@@ -408,6 +409,8 @@ public class ProcessInitializationHandler {
|
||||
@@ -416,6 +417,8 @@ public class ProcessInitializationHandler {
|
||||
.resolveClearDataDialogResultRecorder()::makeDeferredRecordings);
|
||||
deferredStartupHandler.addDeferredTask(WebApkUninstallUmaTracker::recordDeferredUma);
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
chrome/android/java/AndroidManifest.xml | 68 ---
|
||||
.../java/res/xml/privacy_preferences.xml | 5 -
|
||||
.../org/chromium/chrome/browser/AppHooks.java | 14 +-
|
||||
.../browser/ChromeBackgroundService.java | 12 +-
|
||||
.../browser/PlayServicesVersionInfo.java | 12 +-
|
||||
.../ChromeBackgroundTaskFactory.java | 3 -
|
||||
.../ExternalNavigationDelegateImpl.java | 8 +-
|
||||
|
|
@ -109,7 +110,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
third_party/android_deps/BUILD.gn | 539 +-----------------
|
||||
.../preconditions/javatests/BUILD.gn | 1 -
|
||||
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
|
||||
85 files changed, 98 insertions(+), 2049 deletions(-)
|
||||
86 files changed, 99 insertions(+), 2060 deletions(-)
|
||||
|
||||
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
|
||||
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
|
||||
|
|
@ -260,7 +261,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -16,7 +16,6 @@ chrome_java_sources = [
|
||||
@@ -15,7 +15,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeApplicationImpl.java",
|
||||
|
|
@ -268,7 +269,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
|
||||
@@ -953,10 +952,6 @@ chrome_java_sources = [
|
||||
@@ -952,10 +951,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/segmentation_platform/PriceTrackingActionProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java",
|
||||
|
|
@ -462,6 +463,27 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b
|
|||
}
|
||||
|
||||
/**
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackgroundService.java
|
||||
@@ -4,16 +4,6 @@
|
||||
|
||||
package org.chromium.chrome.browser;
|
||||
|
||||
-import org.chromium.build.annotations.IdentifierNameString;
|
||||
-import org.chromium.chrome.browser.base.SplitCompatGcmTaskService;
|
||||
-
|
||||
/** See {@link ChromeBackgroundServiceImpl}. */
|
||||
-public class ChromeBackgroundService extends SplitCompatGcmTaskService {
|
||||
- @IdentifierNameString
|
||||
- private static String sImplClassName =
|
||||
- "org.chromium.chrome.browser.ChromeBackgroundServiceImpl";
|
||||
-
|
||||
- public ChromeBackgroundService() {
|
||||
- super(sImplClassName);
|
||||
- }
|
||||
+public class ChromeBackgroundService {
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/PlayServicesVersionInfo.java
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -305,21 +305,6 @@ chrome_java_sources = [
|
||||
@@ -304,21 +304,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java",
|
||||
|
|
@ -131,7 +131,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java",
|
||||
@@ -360,7 +345,6 @@ chrome_java_sources = [
|
||||
@@ -359,7 +344,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/resources/SystemResourcePreloads.java",
|
||||
|
|
@ -139,7 +139,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
|
||||
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
|
||||
@@ -386,34 +370,6 @@ chrome_java_sources = [
|
||||
@@ -385,34 +369,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java",
|
||||
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java",
|
||||
"java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java",
|
||||
|
|
@ -760,7 +760,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Base
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
@@ -189,12 +189,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
|
||||
@@ -188,12 +188,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
|
||||
mIntentDataProvider.getSession(), webContents);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Subject: Remove price/shopping/commerce integrations
|
|||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
chrome/android/BUILD.gn | 27 ---
|
||||
chrome/android/chrome_java_sources.gni | 4 -
|
||||
chrome/android/chrome_java_sources.gni | 5 -
|
||||
chrome/android/features/tab_ui/BUILD.gn | 7 -
|
||||
.../res/layout/large_message_card_item.xml | 9 -
|
||||
.../java/res/layout/tab_grid_card_item.xml | 8 -
|
||||
|
|
@ -26,16 +26,17 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
.../AppMenuPropertiesDelegateImpl.java | 16 +-
|
||||
.../browser/bookmarks/BookmarkBridge.java | 84 ---------
|
||||
.../bookmarks/BookmarkItemsAdapter.java | 23 ---
|
||||
.../browser/bookmarks/BookmarkManager.java | 11 --
|
||||
.../browser/bookmarks/BookmarkManager.java | 12 --
|
||||
.../BookmarkSaveFlowCoordinator.java | 37 +---
|
||||
.../bookmarks/BookmarkSaveFlowMediator.java | 69 +------
|
||||
.../browser/bookmarks/BookmarkUtils.java | 12 +-
|
||||
.../init/ProcessInitializationHandler.java | 5 -
|
||||
.../ContextualPageActionController.java | 4 -
|
||||
.../chrome/browser/tab/TabHelpers.java | 9 -
|
||||
.../tabbed_mode/TabbedRootUiCoordinator.java | 22 ---
|
||||
.../ToolbarButtonInProductHelpController.java | 27 ---
|
||||
.../browser/toolbar/ToolbarManager.java | 17 --
|
||||
.../chrome/browser/ui/RootUiCoordinator.java | 21 ---
|
||||
.../chrome/browser/ui/RootUiCoordinator.java | 22 ---
|
||||
chrome/android/java_sources.gni | 8 -
|
||||
chrome/browser/BUILD.gn | 2 -
|
||||
.../price_tracking/PriceTrackingFeatures.java | 2 +-
|
||||
|
|
@ -44,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
.../SubscriptionsManagerImpl.java | 26 +--
|
||||
.../optimization_guide_keyed_service.cc | 4 -
|
||||
chrome/browser/persisted_state_db/BUILD.gn | 1 -
|
||||
40 files changed, 29 insertions(+), 929 deletions(-)
|
||||
41 files changed, 29 insertions(+), 936 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
|
|
@ -135,7 +136,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -198,10 +198,6 @@ chrome_java_sources = [
|
||||
@@ -197,10 +197,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkUIState.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkUndoController.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java",
|
||||
|
|
@ -146,6 +147,14 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/bookmarks/ReadingListFeatures.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/ReadingListSectionHeader.java",
|
||||
"java/src/org/chromium/chrome/browser/bookmarks/TabBookmarker.java",
|
||||
@@ -948,7 +944,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/searchwidget/SearchType.java",
|
||||
"java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/segmentation_platform/ContextualPageActionController.java",
|
||||
- "java/src/org/chromium/chrome/browser/segmentation_platform/PriceTrackingActionProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java",
|
||||
"java/src/org/chromium/chrome/browser/settings/MainSettings.java",
|
||||
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
|
||||
--- a/chrome/android/features/tab_ui/BUILD.gn
|
||||
+++ b/chrome/android/features/tab_ui/BUILD.gn
|
||||
|
|
@ -1451,7 +1460,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
|
||||
@@ -206,17 +206,6 @@ public class BookmarkManager
|
||||
@@ -26,7 +26,6 @@ import org.chromium.chrome.browser.commerce.ShoppingFeatures;
|
||||
import org.chromium.chrome.browser.commerce.ShoppingServiceFactory;
|
||||
import org.chromium.chrome.browser.partnerbookmarks.PartnerBookmarksReader;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
-import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
|
||||
import org.chromium.chrome.browser.tab.TabLaunchType;
|
||||
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
|
||||
import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
|
||||
@@ -206,17 +205,6 @@ public class BookmarkManager
|
||||
mBookmarkModel = new BookmarkModel();
|
||||
mMainView = (ViewGroup) LayoutInflater.from(mContext).inflate(R.layout.bookmark_main, null);
|
||||
|
||||
|
|
@ -1747,6 +1764,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
|
|||
});
|
||||
deferredStartupHandler.addDeferredTask(() -> {
|
||||
if (ChromeFeatureList.isEnabled(ChromeFeatureList.FEATURE_NOTIFICATION_GUIDE)) {
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/segmentation_platform/ContextualPageActionController.java b/chrome/android/java/src/org/chromium/chrome/browser/segmentation_platform/ContextualPageActionController.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/segmentation_platform/ContextualPageActionController.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/segmentation_platform/ContextualPageActionController.java
|
||||
@@ -106,10 +106,6 @@ public class ContextualPageActionController {
|
||||
protected void initActionProviders(Supplier<ShoppingService> shoppingServiceSupplier,
|
||||
Supplier<BookmarkModel> bookmarkModelSupplier) {
|
||||
mActionProviders.clear();
|
||||
- if (AdaptiveToolbarFeatures.isPriceTrackingPageActionEnabled()) {
|
||||
- mActionProviders.add(new PriceTrackingActionProvider(
|
||||
- shoppingServiceSupplier, bookmarkModelSupplier));
|
||||
- }
|
||||
if (AdaptiveToolbarFeatures.isReaderModePageActionEnabled()) {
|
||||
mActionProviders.add(new ReaderModeActionProvider());
|
||||
}
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.java
|
||||
|
|
@ -1928,7 +1959,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
@@ -95,7 +95,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
|
||||
@@ -44,7 +44,6 @@ import org.chromium.chrome.browser.app.omnibox.OmniboxPedalDelegateImpl;
|
||||
import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
|
||||
import org.chromium.chrome.browser.back_press.BackPressManager;
|
||||
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
|
||||
-import org.chromium.chrome.browser.bookmarks.PowerBookmarkUtils;
|
||||
import org.chromium.chrome.browser.bookmarks.TabBookmarker;
|
||||
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
|
||||
import org.chromium.chrome.browser.commerce.ShoppingFeatures;
|
||||
@@ -95,7 +94,6 @@ import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
|
||||
import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource;
|
||||
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
|
||||
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
|
||||
|
|
@ -1936,7 +1975,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
|
||||
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
|
||||
@@ -105,7 +104,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
|
||||
@@ -105,7 +103,6 @@ import org.chromium.chrome.browser.share.ShareDelegate.ShareOrigin;
|
||||
import org.chromium.chrome.browser.share.ShareUtils;
|
||||
import org.chromium.chrome.browser.share.qrcode.QrCodeDialog;
|
||||
import org.chromium.chrome.browser.share.scroll_capture.ScrollCaptureManager;
|
||||
|
|
@ -1944,7 +1983,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
|
||||
import org.chromium.chrome.browser.tab.AutofillSessionLifetimeController;
|
||||
import org.chromium.chrome.browser.tab.RequestDesktopUtils;
|
||||
@@ -775,17 +773,6 @@ public class RootUiCoordinator
|
||||
@@ -775,17 +772,6 @@ public class RootUiCoordinator
|
||||
initMerchantTrustSignals();
|
||||
initScrollCapture();
|
||||
|
||||
|
|
@ -1962,7 +2001,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
new OneShotCallback<>(mProfileSupplier, this::initHistoryClustersCoordinator);
|
||||
|
||||
if (DeviceFormFactor.isWindowOnTablet(mWindowAndroid)
|
||||
@@ -1090,12 +1077,6 @@ public class RootUiCoordinator
|
||||
@@ -1090,12 +1076,6 @@ public class RootUiCoordinator
|
||||
|
||||
mIdentityDiscController = new IdentityDiscController(
|
||||
mActivity, mActivityLifecycleDispatcher, mProfileSupplier);
|
||||
|
|
@ -1975,7 +2014,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
ReaderModeToolbarButtonController readerModeToolbarButtonController =
|
||||
new ReaderModeToolbarButtonController(mActivityTabProvider,
|
||||
mModalDialogManagerSupplier.get(),
|
||||
@@ -1146,8 +1127,6 @@ public class RootUiCoordinator
|
||||
@@ -1146,8 +1126,6 @@ public class RootUiCoordinator
|
||||
AdaptiveToolbarButtonVariant.SHARE, shareButtonController);
|
||||
adaptiveToolbarButtonController.addButtonVariant(
|
||||
AdaptiveToolbarButtonVariant.VOICE, voiceToolbarButtonController);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
|
|||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
chrome/android/BUILD.gn | 21 --
|
||||
chrome/android/chrome_java_sources.gni | 29 ---
|
||||
chrome/android/chrome_java_sources.gni | 30 ---
|
||||
.../features/autofill_assistant/BUILD.gn | 1 -
|
||||
.../AssistantAccessTokenUtilChrome.java | 8 -
|
||||
.../AssistantProfileImageUtilChrome.java | 21 +-
|
||||
|
|
@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
.../ClearBrowsingDataFragment.java | 80 +-----
|
||||
.../ClearBrowsingDataFragmentBasic.java | 27 +-
|
||||
.../contacts_picker/ChromePickerAdapter.java | 67 +----
|
||||
.../browser/customtabs/CustomTabActivity.java | 6 -
|
||||
.../browser/customtabs/CustomTabActivity.java | 7 -
|
||||
.../firstrun/FirstRunActivityBase.java | 1 -
|
||||
.../firstrun/LightweightFirstRunActivity.java | 4 +-
|
||||
...FirstRunFragmentWithEnterpriseSupport.java | 6 -
|
||||
|
|
@ -103,7 +103,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
.../identity_services_provider_android.cc | 13 -
|
||||
.../services/IdentityServicesProvider.java | 13 -
|
||||
chrome/browser/supervised_user/BUILD.gn | 1 -
|
||||
.../WebsiteApprovalMediator.java | 23 --
|
||||
.../WebsiteApprovalMediator.java | 24 --
|
||||
chrome/browser/sync/sync_service_factory.cc | 12 +-
|
||||
chrome/browser/ui/android/omnibox/BUILD.gn | 2 -
|
||||
.../browser/omnibox/LocationBarMediator.java | 1 -
|
||||
|
|
@ -126,7 +126,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
.../ProfileOAuth2TokenServiceDelegate.java | 52 ----
|
||||
.../net/HttpNegotiateAuthenticator.java | 88 +------
|
||||
.../chromoting/base/OAuthTokenFetcher.java | 2 -
|
||||
107 files changed, 99 insertions(+), 2657 deletions(-)
|
||||
107 files changed, 99 insertions(+), 2660 deletions(-)
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
|
|
@ -259,7 +259,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -604,14 +604,11 @@ chrome_java_sources = [
|
||||
@@ -11,7 +11,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/AppIndexingUtil.java",
|
||||
"java/src/org/chromium/chrome/browser/ApplicationLifetime.java",
|
||||
"java/src/org/chromium/chrome/browser/BackPressHelper.java",
|
||||
- "java/src/org/chromium/chrome/browser/BackupSigninProcessor.java",
|
||||
"java/src/org/chromium/chrome/browser/BrowserRestartActivity.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeActionModeHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
|
||||
@@ -604,14 +603,11 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java",
|
||||
"java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java",
|
||||
|
|
@ -274,7 +282,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
|
||||
"java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
|
||||
"java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java",
|
||||
@@ -815,7 +812,6 @@ chrome_java_sources = [
|
||||
@@ -815,7 +811,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java",
|
||||
"java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
|
||||
|
|
@ -282,7 +290,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java",
|
||||
"java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java",
|
||||
"java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java",
|
||||
@@ -1023,14 +1019,6 @@ chrome_java_sources = [
|
||||
@@ -1023,14 +1018,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallUma.java",
|
||||
"java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
|
||||
|
|
@ -297,7 +305,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
|
|||
"java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
|
||||
"java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
|
||||
"java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
|
||||
@@ -1071,23 +1059,6 @@ chrome_java_sources = [
|
||||
@@ -1071,23 +1058,6 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
|
||||
"java/src/org/chromium/chrome/browser/survey/SurveyController.java",
|
||||
"java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java",
|
||||
|
|
@ -1969,7 +1977,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
|
||||
@@ -38,7 +38,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid
|
||||
@@ -28,7 +28,6 @@ import androidx.browser.customtabs.CustomTabsSessionToken;
|
||||
import org.chromium.base.IntentUtils;
|
||||
import org.chromium.base.metrics.RecordUserAction;
|
||||
import org.chromium.chrome.R;
|
||||
-import org.chromium.chrome.browser.BackupSigninProcessor;
|
||||
import org.chromium.chrome.browser.LaunchIntentDispatcher;
|
||||
import org.chromium.chrome.browser.app.metrics.LaunchCauseMetrics;
|
||||
import org.chromium.chrome.browser.autofill_assistant.AutofillAssistantFacade;
|
||||
@@ -38,7 +37,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid
|
||||
import org.chromium.chrome.browser.customtabs.dependency_injection.BaseCustomTabActivityComponent;
|
||||
import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
|
||||
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
|
||||
|
|
@ -1977,7 +1993,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
|
|||
import org.chromium.chrome.browser.flags.AllCachedFieldTrialParameters;
|
||||
import org.chromium.chrome.browser.flags.ChromeFeatureList;
|
||||
import org.chromium.chrome.browser.fonts.FontPreloader;
|
||||
@@ -151,11 +150,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
|
||||
@@ -151,11 +149,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
|
||||
|
||||
@Override
|
||||
public void finishNativeInitialization() {
|
||||
|
|
@ -4490,7 +4506,15 @@ diff --git a/chrome/browser/supervised_user/BUILD.gn b/chrome/browser/supervised
|
|||
diff --git a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java b/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java
|
||||
--- a/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java
|
||||
+++ b/chrome/browser/supervised_user/android/java/src/org/chromium/chrome/browser/supervised_user/website_approval/WebsiteApprovalMediator.java
|
||||
@@ -43,28 +43,5 @@ class WebsiteApprovalMediator {
|
||||
@@ -5,7 +5,6 @@
|
||||
package org.chromium.chrome.browser.supervised_user.website_approval;
|
||||
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
|
||||
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
|
||||
import org.chromium.components.signin.base.AccountInfo;
|
||||
import org.chromium.components.signin.base.CoreAccountInfo;
|
||||
@@ -43,28 +42,5 @@ class WebsiteApprovalMediator {
|
||||
BottomSheetController.StateChangeReason.INTERACTION_COMPLETE);
|
||||
mCompletionCallback.onWebsiteDenied();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
|
|||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
|
||||
@@ -91,8 +91,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
|
||||
@@ -90,8 +90,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
|
||||
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
|
||||
import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
|
||||
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
|
||||
|
|
@ -506,7 +506,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
|
||||
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
|
||||
import org.chromium.chrome.browser.profiles.Profile;
|
||||
@@ -272,7 +270,6 @@ public class RootUiCoordinator
|
||||
@@ -271,7 +269,6 @@ public class RootUiCoordinator
|
||||
protected OneshotSupplierImpl<Boolean> mPromoShownOneshotSupplier = new OneshotSupplierImpl<>();
|
||||
protected Supplier<Tab> mStartSurfaceParentTabSupplier;
|
||||
@Nullable
|
||||
|
|
@ -514,7 +514,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
private MediaCaptureOverlayController mCaptureController;
|
||||
private @Nullable ScrollCaptureManager mScrollCaptureManager;
|
||||
protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
|
||||
@@ -547,9 +544,6 @@ public class RootUiCoordinator
|
||||
@@ -546,9 +543,6 @@ public class RootUiCoordinator
|
||||
}
|
||||
|
||||
if (mToolbarManager != null) {
|
||||
|
|
@ -524,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
mToolbarManager.destroy();
|
||||
mToolbarManager = null;
|
||||
}
|
||||
@@ -1092,19 +1086,11 @@ public class RootUiCoordinator
|
||||
@@ -1091,19 +1085,11 @@ public class RootUiCoordinator
|
||||
new VoiceToolbarButtonController.VoiceSearchDelegate() {
|
||||
@Override
|
||||
public boolean isVoiceSearchEnabled() {
|
||||
|
|
@ -545,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
|
|||
}
|
||||
};
|
||||
VoiceToolbarButtonController voiceToolbarButtonController =
|
||||
@@ -1154,13 +1140,6 @@ public class RootUiCoordinator
|
||||
@@ -1153,13 +1139,6 @@ public class RootUiCoordinator
|
||||
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
|
||||
mToolbarManager.getToolbar().disableMenuButton();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -540,6 +540,7 @@ chrome_java_sources = [
|
||||
@@ -539,6 +539,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/feedback/FeedFeedbackCollector.java",
|
||||
"java/src/org/chromium/chrome/browser/feedback/HelpAndFeedbackLauncherImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/feedback/ScreenshotTask.java",
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
|||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -4968,6 +4968,11 @@
|
||||
@@ -4969,6 +4969,11 @@
|
||||
"owners": [ "adamta", "sczs" ],
|
||||
"expiry_milestone": 98
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,19 +2,21 @@ From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|||
Date: Thu, 16 Jun 2022 23:23:43 +0200
|
||||
Subject: Revert "Delete block-external-form-redirects"
|
||||
|
||||
This reverts commit b710cefb53b558a8bcd884f6baf0229ba4225721.
|
||||
This reverts commit b710cefb53b558a8bcd884f6baf0229ba4225721 and
|
||||
enables IntentBlockExternalFormRedirectsNoGesture.
|
||||
|
||||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
chrome/browser/about_flags.cc | 7 +++++++
|
||||
chrome/browser/flag-metadata.json | 4 ++++
|
||||
chrome/browser/flag_descriptions.cc | 6 ++++++
|
||||
chrome/browser/flag_descriptions.h | 3 +++
|
||||
.../android/external_intents_features.cc | 6 +++++-
|
||||
.../android/external_intents_features.h | 1 +
|
||||
.../ExternalIntentsFeatures.java | 6 ++++++
|
||||
.../ExternalNavigationHandler.java | 17 +++++++++++++++++
|
||||
8 files changed, 49 insertions(+), 1 deletion(-)
|
||||
chrome/browser/about_flags.cc | 7 +++++++
|
||||
chrome/browser/flag-metadata.json | 5 +++++
|
||||
chrome/browser/flag_descriptions.cc | 6 ++++++
|
||||
chrome/browser/flag_descriptions.h | 3 +++
|
||||
.../android/external_intents_features.cc | 7 ++++++-
|
||||
.../android/external_intents_features.h | 1 +
|
||||
.../ExternalIntentsFeatures.java | 6 ++++++
|
||||
.../ExternalNavigationHandler.java | 21 +++++++++++++++++++
|
||||
.../ExternalNavigationHandlerTest.java | 11 ++++++----
|
||||
9 files changed, 62 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
|
|
@ -43,12 +45,13 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
|||
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
|
||||
--- a/chrome/browser/flag-metadata.json
|
||||
+++ b/chrome/browser/flag-metadata.json
|
||||
@@ -698,6 +698,10 @@
|
||||
@@ -698,6 +698,11 @@
|
||||
"owners": [ "ioanap", "vsemeniuk@google.com" ],
|
||||
"expiry_milestone": 108
|
||||
},
|
||||
+ {
|
||||
+ "name": "block-external-form-redirects-no-gesture",
|
||||
+ "owners": [ "jochen", "tedchoc" ],
|
||||
+ "expiry_milestone": -1
|
||||
+ },
|
||||
{
|
||||
|
|
@ -86,22 +89,23 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
|
|||
diff --git a/components/external_intents/android/external_intents_features.cc b/components/external_intents/android/external_intents_features.cc
|
||||
--- a/components/external_intents/android/external_intents_features.cc
|
||||
+++ b/components/external_intents/android/external_intents_features.cc
|
||||
@@ -18,7 +18,7 @@ namespace {
|
||||
|
||||
@@ -19,7 +19,8 @@ namespace {
|
||||
// Array of features exposed through the Java ExternalIntentsFeatures API.
|
||||
const base::Feature* kFeaturesExposedToJava[] = {
|
||||
- &kAutofillAssistantGoogleInitiatorOriginCheck,
|
||||
+ &kAutofillAssistantGoogleInitiatorOriginCheck, &kIntentBlockExternalFormRedirectsNoGesture,
|
||||
&kBlockExternalFormSubmitWithoutGesture, &kExternalNavigationDebugLogs};
|
||||
&kAutofillAssistantGoogleInitiatorOriginCheck,
|
||||
- &kBlockExternalFormSubmitWithoutGesture, &kExternalNavigationDebugLogs};
|
||||
+ &kBlockExternalFormSubmitWithoutGesture, &kExternalNavigationDebugLogs,
|
||||
+ &kIntentBlockExternalFormRedirectsNoGesture};
|
||||
|
||||
} // namespace
|
||||
@@ -41,6 +41,10 @@ BASE_FEATURE(kExternalNavigationDebugLogs,
|
||||
|
||||
@@ -41,6 +42,10 @@ BASE_FEATURE(kExternalNavigationDebugLogs,
|
||||
"ExternalNavigationDebugLogs",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
+const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
|
||||
+ "IntentBlockExternalFormRedirectsNoGesture",
|
||||
+ base::FEATURE_DISABLED_BY_DEFAULT};
|
||||
+BASE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture,
|
||||
+ "IntentBlockExternalFormRedirectsNoGesture",
|
||||
+ base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
+
|
||||
static jlong JNI_ExternalIntentsFeatures_GetFeature(JNIEnv* env, jint ordinal) {
|
||||
return reinterpret_cast<jlong>(kFeaturesExposedToJava[ordinal]);
|
||||
|
|
@ -109,14 +113,14 @@ diff --git a/components/external_intents/android/external_intents_features.cc b/
|
|||
diff --git a/components/external_intents/android/external_intents_features.h b/components/external_intents/android/external_intents_features.h
|
||||
--- a/components/external_intents/android/external_intents_features.h
|
||||
+++ b/components/external_intents/android/external_intents_features.h
|
||||
@@ -11,6 +11,7 @@ namespace external_intents {
|
||||
|
||||
@@ -12,6 +12,7 @@ namespace external_intents {
|
||||
// Alphabetical:
|
||||
BASE_DECLARE_FEATURE(kAutofillAssistantGoogleInitiatorOriginCheck);
|
||||
+extern const base::Feature kIntentBlockExternalFormRedirectsNoGesture;
|
||||
BASE_DECLARE_FEATURE(kBlockExternalFormSubmitWithoutGesture);
|
||||
+BASE_DECLARE_FEATURE(kIntentBlockExternalFormRedirectsNoGesture);
|
||||
BASE_DECLARE_FEATURE(kExternalNavigationDebugLogs);
|
||||
|
||||
} // namespace external_intents
|
||||
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
|
||||
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
|
||||
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalIntentsFeatures.java
|
||||
|
|
@ -136,8 +140,8 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
|
|||
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
|
||||
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
|
||||
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
|
||||
@@ -897,6 +897,12 @@ public class ExternalNavigationHandler {
|
||||
return true;
|
||||
@@ -1588,6 +1588,12 @@ public class ExternalNavigationHandler {
|
||||
}
|
||||
}
|
||||
|
||||
+ /** Wrapper of check against the feature to support overriding for testing. */
|
||||
|
|
@ -146,26 +150,62 @@ diff --git a/components/external_intents/android/java/src/org/chromium/component
|
|||
+ return ExternalIntentsFeatures.INTENT_BLOCK_EXTERNAL_FORM_REDIRECT_NO_GESTURE.isEnabled();
|
||||
+ }
|
||||
+
|
||||
/**
|
||||
* The "about:", "chrome:", "chrome-native:", and "devtools:" schemes
|
||||
* are internal to the browser; don't want these to be dispatched to other apps.
|
||||
@@ -938,6 +944,17 @@ public class ExternalNavigationHandler {
|
||||
return hasContentScheme;
|
||||
}
|
||||
private OverrideUrlLoadingResult shouldOverrideUrlLoadingInternal(
|
||||
ExternalNavigationParams params, Intent targetIntent, GURL browserFallbackUrl,
|
||||
MutableBoolean canLaunchExternalFallbackResult) {
|
||||
@@ -1637,6 +1643,21 @@ public class ExternalNavigationHandler {
|
||||
return OverrideUrlLoadingResult.forNoOverride();
|
||||
}
|
||||
|
||||
+ // http://crbug.com/839751: Require user gestures for form submits to external
|
||||
+ // protocols.
|
||||
+ // TODO(tedchoc): Turn this on by default once we verify this change does
|
||||
+ // not break the world.
|
||||
+ int pageTransitionCore = params.getPageTransition() & PageTransition.CORE_MASK;
|
||||
+ boolean isFormSubmit = pageTransitionCore == PageTransition.FORM_SUBMIT;
|
||||
+ boolean isRedirectFromFormSubmit = isFormSubmit && params.isRedirect();
|
||||
+ if (isRedirectFromFormSubmit && !incomingIntentRedirect && !params.hasUserGesture()
|
||||
+ && blockExternalFormRedirectsWithoutGesture()) {
|
||||
+ if (debug()) {
|
||||
+ Log.i(TAG, "Incoming form intent attempting to redirect without user gesture");
|
||||
+ }
|
||||
+ return false;
|
||||
+ return OverrideUrlLoadingResult.forNoOverride();
|
||||
+ }
|
||||
/**
|
||||
* Intent URIs leads to creating intents that chrome would use for firing external navigations
|
||||
* via Android. Android throws an exception [1] when an application exposes a file:// Uri to
|
||||
+
|
||||
if (hasInternalScheme(params.getUrl(), targetIntent)
|
||||
|| hasContentScheme(params.getUrl(), targetIntent)
|
||||
|| hasFileSchemeInIntentURI(params.getUrl(), targetIntent)) {
|
||||
diff --git a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
|
||||
--- a/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
|
||||
+++ b/components/external_intents/android/javatests/src/org/chromium/components/external_intents/ExternalNavigationHandlerTest.java
|
||||
@@ -299,14 +299,12 @@ public class ExternalNavigationHandlerTest {
|
||||
.withIsRedirect(true)
|
||||
.withHasUserGesture(true)
|
||||
.withRedirectHandler(handler)
|
||||
- .expecting(OverrideUrlLoadingResultType.OVERRIDE_WITH_EXTERNAL_INTENT,
|
||||
- START_OTHER_ACTIVITY);
|
||||
+ .expecting(OverrideUrlLoadingResultType.NO_OVERRIDE, IGNORE);
|
||||
checkUrl("http://youtube.com://")
|
||||
.withPageTransition(PageTransition.FORM_SUBMIT)
|
||||
.withIsRedirect(true)
|
||||
.withHasUserGesture(true)
|
||||
- .expecting(OverrideUrlLoadingResultType.OVERRIDE_WITH_EXTERNAL_INTENT,
|
||||
- START_OTHER_ACTIVITY);
|
||||
+ .expecting(OverrideUrlLoadingResultType.NO_OVERRIDE, IGNORE);
|
||||
|
||||
// If the page matches the referrer, then continue loading in Chrome.
|
||||
checkUrl("http://youtube.com://")
|
||||
@@ -2891,6 +2889,11 @@ public class ExternalNavigationHandlerTest {
|
||||
&& !packageName.equals(INVALID_WEBAPK_PACKAGE_NAME);
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public boolean blockExternalFormRedirectsWithoutGesture() {
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
@Override
|
||||
protected boolean canLaunchIncognitoIntent(Intent intent, Context context) {
|
||||
mStartActivityInIncognitoIntent = intent;
|
||||
--
|
||||
2.25.1
|
||||
|
|
|
|||
|
|
@ -17,14 +17,10 @@ This reverts commit 11f6a3e29bee9a6590a4fd56b28e8048200c18d0.
|
|||
Original License: BSD-3-Clause - https://spdx.org/licenses/BSD-3-Clause.html
|
||||
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||||
---
|
||||
.../renderer_host/policy_container_host.cc | 3 +-
|
||||
content/renderer/policy_container_util.cc | 1 +
|
||||
.../public/mojom/frame/policy_container.mojom | 3 ++
|
||||
.../public/platform/web_policy_container.h | 2 ++
|
||||
.../execution_context/execution_context.cc | 9 +++++
|
||||
.../execution_context/execution_context.h | 4 +++
|
||||
.../core/exported/web_shared_worker_impl.cc | 1 +
|
||||
.../renderer/core/frame/policy_container.cc | 11 ++++++
|
||||
.../renderer/core/frame/policy_container.cc | 10 ++++++
|
||||
.../renderer/core/frame/policy_container.h | 11 ++++++
|
||||
.../renderer/core/frame/web_frame_test.cc | 34 +++++++++++++++++++
|
||||
.../layout_worklet_global_scope_proxy.cc | 2 +-
|
||||
|
|
@ -57,78 +53,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|||
.../audio_worklet_global_scope_test.cc | 1 +
|
||||
.../webaudio/audio_worklet_thread_test.cc | 1 +
|
||||
.../worklet/worklet_thread_test_common.cc | 2 +-
|
||||
40 files changed, 198 insertions(+), 25 deletions(-)
|
||||
36 files changed, 189 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/content/browser/renderer_host/policy_container_host.cc b/content/browser/renderer_host/policy_container_host.cc
|
||||
--- a/content/browser/renderer_host/policy_container_host.cc
|
||||
+++ b/content/browser/renderer_host/policy_container_host.cc
|
||||
@@ -134,6 +134,7 @@ PolicyContainerPolicies::PolicyContainerPolicies(
|
||||
cross_origin_embedder_policy(cross_origin_embedder_policy),
|
||||
sandbox_flags(sandbox_flags),
|
||||
is_anonymous(is_anonymous),
|
||||
+ ip_address_space = policies.ip_address_space;
|
||||
can_navigate_top_without_user_gesture(
|
||||
can_navigate_top_without_user_gesture) {}
|
||||
|
||||
@@ -201,7 +202,7 @@ void PolicyContainerPolicies::AddContentSecurityPolicies(
|
||||
blink::mojom::PolicyContainerPoliciesPtr
|
||||
PolicyContainerPolicies::ToMojoPolicyContainerPolicies() const {
|
||||
return blink::mojom::PolicyContainerPolicies::New(
|
||||
- cross_origin_embedder_policy.value, referrer_policy,
|
||||
+ cross_origin_embedder_policy.value, referrer_policy, ip_address_space,
|
||||
mojo::Clone(content_security_policies), is_anonymous, sandbox_flags,
|
||||
ip_address_space, can_navigate_top_without_user_gesture);
|
||||
}
|
||||
diff --git a/content/renderer/policy_container_util.cc b/content/renderer/policy_container_util.cc
|
||||
--- a/content/renderer/policy_container_util.cc
|
||||
+++ b/content/renderer/policy_container_util.cc
|
||||
@@ -18,6 +18,7 @@ std::unique_ptr<blink::WebPolicyContainer> ToWebPolicyContainer(
|
||||
blink::WebPolicyContainerPolicies{
|
||||
in->policies->cross_origin_embedder_policy,
|
||||
in->policies->referrer_policy,
|
||||
+ in->policies->ip_address_space,
|
||||
ToWebContentSecurityPolicies(
|
||||
std::move(in->policies->content_security_policies)),
|
||||
in->policies->is_anonymous,
|
||||
diff --git a/third_party/blink/public/mojom/frame/policy_container.mojom b/third_party/blink/public/mojom/frame/policy_container.mojom
|
||||
--- a/third_party/blink/public/mojom/frame/policy_container.mojom
|
||||
+++ b/third_party/blink/public/mojom/frame/policy_container.mojom
|
||||
@@ -7,6 +7,7 @@ module blink.mojom;
|
||||
import "services/network/public/mojom/content_security_policy.mojom";
|
||||
import "services/network/public/mojom/cross_origin_embedder_policy.mojom";
|
||||
import "services/network/public/mojom/ip_address_space.mojom";
|
||||
+import "services/network/public/mojom/ip_address_space.mojom";
|
||||
import "services/network/public/mojom/referrer_policy.mojom";
|
||||
import "services/network/public/mojom/web_sandbox_flags.mojom";
|
||||
|
||||
@@ -19,6 +20,8 @@ struct PolicyContainerPolicies {
|
||||
network.mojom.CrossOriginEmbedderPolicyValue.kNone;
|
||||
network.mojom.ReferrerPolicy referrer_policy =
|
||||
network.mojom.ReferrerPolicy.kDefault;
|
||||
+ network.mojom.IPAddressSpace ip_address_space =
|
||||
+ network.mojom.IPAddressSpace.kUnknown;
|
||||
array<network.mojom.ContentSecurityPolicy> content_security_policies;
|
||||
bool is_anonymous = false;
|
||||
network.mojom.WebSandboxFlags sandbox_flags =
|
||||
diff --git a/third_party/blink/public/platform/web_policy_container.h b/third_party/blink/public/platform/web_policy_container.h
|
||||
--- a/third_party/blink/public/platform/web_policy_container.h
|
||||
+++ b/third_party/blink/public/platform/web_policy_container.h
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include "services/network/public/mojom/cross_origin_embedder_policy.mojom-shared.h"
|
||||
#include "services/network/public/mojom/ip_address_space.mojom-shared.h"
|
||||
+#include "services/network/public/mojom/ip_address_space.mojom-shared.h"
|
||||
#include "services/network/public/mojom/referrer_policy.mojom-shared.h"
|
||||
#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
|
||||
#include "third_party/blink/public/mojom/frame/policy_container.mojom-shared.h"
|
||||
@@ -23,6 +24,7 @@ struct WebPolicyContainerPolicies {
|
||||
network::mojom::CrossOriginEmbedderPolicyValue::kNone;
|
||||
network::mojom::ReferrerPolicy referrer_policy =
|
||||
network::mojom::ReferrerPolicy::kDefault;
|
||||
+ network::mojom::IPAddressSpace ip_address_space;
|
||||
WebVector<WebContentSecurityPolicy> content_security_policies;
|
||||
bool is_anonymous = false;
|
||||
network::mojom::WebSandboxFlags sandbox_flags =
|
||||
diff --git a/third_party/blink/renderer/core/execution_context/execution_context.cc b/third_party/blink/renderer/core/execution_context/execution_context.cc
|
||||
--- a/third_party/blink/renderer/core/execution_context/execution_context.cc
|
||||
+++ b/third_party/blink/renderer/core/execution_context/execution_context.cc
|
||||
|
|
@ -183,15 +109,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_shared_worker_impl.cc
|
|||
diff --git a/third_party/blink/renderer/core/frame/policy_container.cc b/third_party/blink/renderer/core/frame/policy_container.cc
|
||||
--- a/third_party/blink/renderer/core/frame/policy_container.cc
|
||||
+++ b/third_party/blink/renderer/core/frame/policy_container.cc
|
||||
@@ -37,6 +37,7 @@ std::unique_ptr<PolicyContainer> PolicyContainer::CreateFromWebPolicyContainer(
|
||||
mojom::blink::PolicyContainerPolicies::New(
|
||||
container->policies.cross_origin_embedder_policy,
|
||||
container->policies.referrer_policy,
|
||||
+ container->policies.ip_address_space,
|
||||
ConvertToMojoBlink(
|
||||
std::move(container->policies.content_security_policies)),
|
||||
container->policies.is_anonymous, container->policies.sandbox_flags,
|
||||
@@ -52,12 +53,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy()
|
||||
@@ -52,12 +52,22 @@ network::mojom::blink::ReferrerPolicy PolicyContainer::GetReferrerPolicy()
|
||||
return policies_->referrer_policy;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
|
|||
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
|
||||
--- a/chrome/android/chrome_java_sources.gni
|
||||
+++ b/chrome/android/chrome_java_sources.gni
|
||||
@@ -896,6 +896,7 @@ chrome_java_sources = [
|
||||
@@ -895,6 +895,7 @@ chrome_java_sources = [
|
||||
"java/src/org/chromium/chrome/browser/payments/ui/DimmingDialog.java",
|
||||
"java/src/org/chromium/chrome/browser/payments/ui/LineItem.java",
|
||||
"java/src/org/chromium/chrome/browser/payments/ui/PaymentAppComparator.java",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue