0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More fixes

Browse source 
Start using new SystemWebView package name
This commit is contained in:
csagan5 2022-02-14 21:18:16 +01:00
parent a7bf22d52b
commit aeb4e499e6
12 changed files with 97 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/bromite.gn_args
View file

@ -33,6 +33,7 @@ proprietary_codecs=true
rtc_build_examples=false
safe_browsing_mode=0
symbol_level=1
system_webview_package_name="org.bromite.webview"
target_os="android"
use_debug_fission=true
use_errorprone_java_compiler=false

14
build/patches/Add-flag-to-disable-WebGL.patch
View file

@ -24,17 +24,17 @@ 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
@@ -690,6 +690,10 @@ const char kEnableAutofillAddressSavePromptDescription[] =
"Enable the Autofill address save prompts.";
const char kEnableAutofillCreditCardAuthenticationName[] =
@@ -678,6 +678,10 @@ const char kDocumentTransitionSlowdownFactorName[] =
const char kDocumentTransitionSlowdownFactorDescription[] =
"Slows down animations triggered by documentTransition JavaScript API for "
"debugging.";
+const char kDisableWebGLName[] = "WebGL";
+
+const char kDisableWebGLDescription[] = "Enable or disable all versions of WebGL";
+
"Allow using platform authenticators to retrieve server cards";
const char kEnableAutofillCreditCardAuthenticationDescription[] =
"When enabled, users will be given the option to use a platform "
const char kEnableAutofillAccountWalletStorageName[] =
"Enable the account data storage for autofill";
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

2
build/patches/Add-history-support-in-incognito-mode.patch
View file

@ -338,7 +338,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onResume() {
super.onResume();
@@ -214,6 +224,13 @@ public class PrivacySettings
@@ -219,6 +229,13 @@ public class PrivacySettings
PrivacySandboxSettingsFragment.getStatusString(getContext()));
}

6
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
View file

@ -154,9 +154,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
+ // Used to bookmark all tabs in a specific folder, created if not existing
+ public BookmarkId addToTabsCollection(Context context, Tab tab) {
+ BookmarkId parent = getTabsCollectionFolderId();
+ long existingId = getUserBookmarkIdForTab(tab);
+ if (existingId != BookmarkId.INVALID_ID) {
+ BookmarkId existingBookmarkId = new BookmarkId(existingId, BookmarkType.NORMAL);
+ BookmarkId existingId = getUserBookmarkIdForTab(tab);
+ if (existingId != null && existingId.getId() != BookmarkId.INVALID_ID) {
+ BookmarkId existingBookmarkId = new BookmarkId(existingId.getId(), BookmarkType.NORMAL);
+ BookmarkItem existingBookmark = getBookmarkById(existingBookmarkId);
+ if (parent.equals(existingBookmark.getParentId())) {
+ // bookmark already exists in the tabs collection folder

12
build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
View file

@ -81,18 +81,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
@@ -208,6 +217,11 @@ public class PrivacySettings
}
@@ -193,6 +202,11 @@ public class PrivacySettings
: R.string.text_off);
}
private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() {
+ ChromeSwitchPreference closeTabsOnExitPref =
+ (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
+ closeTabsOnExitPref.setOnPreferenceChangeListener(this);
+ closeTabsOnExitPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
+
return preference -> {
String key = preference.getKey();
if (PREF_NETWORK_PREDICTIONS.equals(key)) {
Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
if (secureDnsPref != null && secureDnsPref.isVisible()) {
secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd

13
build/patches/Allow-building-without-enable_reporting.patch
View file

@ -6,7 +6,7 @@ Subject: Allow building without enable_reporting
content/browser/BUILD.gn | 8 ++++----
.../devtools/protocol/network_handler.cc | 2 ++
.../devtools/protocol/network_handler.h | 2 ++
.../cross_origin_embedder_policy_reporter.cc | 2 ++
.../cross_origin_embedder_policy_reporter.cc | 3 ++-
.../net/cross_origin_opener_policy_reporter.cc | 16 +++++++---------
.../renderer_host/render_frame_host_impl.cc | 2 ++
.../web_package/signed_exchange_reporter.cc | 2 ++
@ -20,7 +20,7 @@ Subject: Allow building without enable_reporting
.../blink/renderer/core/frame/local_frame.h | 6 +++---
.../renderer/core/frame/reporting_context.cc | 9 +++++++++
.../renderer/core/frame/reporting_context.h | 7 +++++--
17 files changed, 56 insertions(+), 46 deletions(-)
17 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
--- a/content/browser/BUILD.gn
@ -91,14 +91,15 @@ diff --git a/content/browser/net/cross_origin_embedder_policy_reporter.cc b/cont
base::DictionaryValue body_to_pass;
for (const auto& pair : body) {
body_to_pass.SetString(pair.first, pair.second);
@@ -122,6 +123,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
storage_partition->GetNetworkContext()->QueueReport(
@@ -123,7 +124,7 @@ void CrossOriginEmbedderPolicyReporter::QueueAndNotify(
kType, *endpoint, context_url_, reporting_source_,
network_isolation_key_,
+#endif
/*user_agent=*/absl::nullopt, std::move(body_to_pass));
}
- }
+#endif
}
}
diff --git a/content/browser/net/cross_origin_opener_policy_reporter.cc b/content/browser/net/cross_origin_opener_policy_reporter.cc
--- a/content/browser/net/cross_origin_opener_policy_reporter.cc
+++ b/content/browser/net/cross_origin_opener_policy_reporter.cc

2
build/patches/Disable-privacy-sandbox.patch
View file

@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
Preference privacyReviewPreference = findPreference(PREF_PRIVACY_REVIEW);
if (!ChromeFeatureList.isEnabled(ChromeFeatureList.PRIVACY_REVIEW)) {
getPreferenceScreen().removePreference(privacyReviewPreference);
@@ -296,17 +283,11 @@ public class PrivacySettings
@@ -301,17 +288,11 @@ public class PrivacySettings
secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
}

10
build/patches/Disable-text-fragments-by-default.patch
View file

@ -75,7 +75,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -4033,6 +4033,10 @@ void Document::SetURL(const KURL& url) {
@@ -4033,9 +4033,14 @@ void Document::SetURL(const KURL& url) {
TRACE_EVENT1("navigation", "Document::SetURL", "url",
new_url.GetString().Utf8());
@ -86,14 +86,10 @@ diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink
// Strip the fragment directive from the URL fragment. E.g. "#id:~:text=a"
// --> "#id". See https://github.com/WICG/scroll-to-text-fragment.
new_url = fragment_directive_->ConsumeFragmentDirective(new_url);
@@ -4079,6 +4083,7 @@ void Document::UpdateBaseURL() {
DCHECK(!elem_sheet_->Contents()->RuleCount());
elem_sheet_ = CSSStyleSheet::CreateInline(*this, base_url_);
}
+ }
if (!EqualIgnoringFragmentIdentifier(old_base_url, base_url_)) {
// Base URL change changes any relative visited links.
url_ = new_url;
access_entry_from_url_ = nullptr;
diff --git a/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc b/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc
--- a/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc
+++ b/third_party/blink/renderer/core/page/scrolling/text_fragment_anchor_metrics_test.cc

13
build/patches/Experimental-user-scripts-support.patch
View file

@ -93,7 +93,7 @@ See also: components/user_scripts/README.md
.../user_scripts/common/script_constants.h | 33 +
components/user_scripts/common/url_pattern.cc | 803 ++++++++++++++++++
components/user_scripts/common/url_pattern.h | 302 +++++++
.../user_scripts/common/url_pattern_set.cc | 334 ++++++++
.../user_scripts/common/url_pattern_set.cc | 335 ++++++++
.../user_scripts/common/url_pattern_set.h | 161 ++++
components/user_scripts/common/user_script.cc | 317 +++++++
components/user_scripts/common/user_script.h | 403 +++++++++
@ -133,7 +133,7 @@ See also: components/user_scripts/README.md
.../renderer/web_ui_injection_host.h | 28 +
.../strings/userscripts_strings.grdp | 55 ++
tools/gritsettings/resource_ids.spec | 6 +
111 files changed, 9579 insertions(+), 2 deletions(-)
111 files changed, 9580 insertions(+), 2 deletions(-)
create mode 100644 components/user_scripts/README.md
create mode 100755 components/user_scripts/android/BUILD.gn
create mode 100644 components/user_scripts/android/java/res/layout/accept_script_item.xml
@ -2498,7 +2498,7 @@ new file mode 100755
+
+#include "file_task_runner.h"
+
+#include "base/sequenced_task_runner.h"
+#include "base/task/sequenced_task_runner.h"
+#include "base/task/lazy_thread_pool_task_runner.h"
+#include "base/task/task_traits.h"
+
@ -5919,7 +5919,7 @@ diff --git a/components/user_scripts/common/url_pattern_set.cc b/components/user
new file mode 100755
--- /dev/null
+++ b/components/user_scripts/common/url_pattern_set.cc
@@ -0,0 +1,334 @@
@@ -0,0 +1,335 @@
+// Copyright (c) 2012 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.
@ -6117,7 +6117,8 @@ new file mode 100755
+ if (origin.is_empty())
+ return false;
+ const url::Origin real_origin = url::Origin::Create(origin);
+ DCHECK(real_origin.IsSameOriginWith(url::Origin::Create(origin.GetOrigin())));
+ DCHECK(real_origin.IsSameOriginWith(url::Origin::Create(
+ origin.DeprecatedGetOriginAsURL())));
+ URLPattern origin_pattern(valid_schemes);
+ // Origin adding could fail if |origin| does not match |valid_schemes|.
+ if (origin_pattern.Parse(origin.spec()) !=
@ -8840,7 +8841,7 @@ new file mode 100755
+ FROM_HERE,
+ base::BindOnce(&ScriptInjectionManager::RFOHelper::RunIdle,
+ weak_factory_.GetWeakPtr()),
+ base::TimeDelta::FromMilliseconds(kScriptIdleTimeoutInMs));
+ base::Milliseconds(kScriptIdleTimeoutInMs));
+
+ ExtensionFrameHelper::Get(render_frame())
+ ->ScheduleAtDocumentIdle(

2
build/patches/JIT-less-toggle.patch
View file

@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
} else if (PREF_AUTOFILL_ASSISTANT.equals(key)) {
mSharedPreferencesManager.writeBoolean(
ChromePreferenceKeys.AUTOFILL_ASSISTANT_ENABLED, (boolean) newValue);
@@ -268,6 +274,11 @@ public class PrivacySettings
@@ -273,6 +279,11 @@ public class PrivacySettings
Preference privacySandboxPreference = findPreference(PREF_PRIVACY_SANDBOX);
if (privacySandboxPreference != null) {

64
build/patches/Remove-signin-and-data-saver-integrations.patch
View file

@ -33,7 +33,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
.../chrome/browser/ChromeTabbedActivity.java | 16 --
.../chrome/browser/app/ChromeActivity.java | 75 --------
.../AutofillAssistantPreferenceFragment.java | 12 --
.../bookmarks/BookmarkItemsAdapter.java | 46 +----
.../bookmarks/BookmarkItemsAdapter.java | 47 +----
.../bookmarks/BookmarkPromoHeader.java | 182 +-----------------
.../ClearBrowsingDataFragmentBasic.java | 5 +-
.../contextualsearch/ContextualSearchUma.java | 5 -
@ -61,6 +61,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
.../tasks/ReturnToChromeExperimentsUtil.java | 9 +-
chrome/browser/BUILD.gn | 10 -
.../browser/firstrun/MobileFreProgress.java | 4 +-
.../res/layout/privacy_review_msbb_step.xml | 8 -
.../identity_services_provider_android.cc | 9 -
.../services/IdentityServicesProvider.java | 14 --
chrome/browser/sync/sync_service_factory.cc | 12 +-
@ -74,7 +75,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
.../signin/SystemAccountManagerDelegate.java | 25 +--
.../net/HttpNegotiateAuthenticator.java | 88 +--------
.../chromoting/base/OAuthTokenFetcher.java | 2 -
55 files changed, 53 insertions(+), 1281 deletions(-)
56 files changed, 54 insertions(+), 1289 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
@ -830,7 +831,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assist
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
@@ -50,7 +50,7 @@ import java.util.List;
@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkMeta;
import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkType;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
-import org.chromium.chrome.browser.sync.SyncService;
import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
import org.chromium.components.bookmarks.BookmarkId;
@@ -50,7 +49,7 @@ import java.util.List;
* BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
*/
class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@ -839,7 +848,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
private static final String EMPTY_QUERY = null;
@@ -62,10 +62,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -62,10 +61,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@ViewType
private int mPromoHeaderType = ViewType.INVALID;
private BookmarkDelegate mDelegate;
@ -850,7 +859,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private CommerceSubscriptionsServiceFactory mCommerceSubscriptionsServiceFactory;
// Keep track of the currently highlighted bookmark - used for "show in folder" action.
@@ -119,8 +117,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -119,8 +116,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
BookmarkItemsAdapter(Context context) {
super(context);
@ -859,7 +868,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
mImageFetcher =
ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
@@ -219,9 +215,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -219,9 +214,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
case ViewType.PERSONALIZED_SIGNIN_PROMO:
// fall through
case ViewType.PERSONALIZED_SYNC_PROMO:
@ -871,7 +880,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
case ViewType.SECTION_HEADER:
return createSectionHeaderViewHolder(parent, viewType);
case ViewType.FOLDER:
@@ -252,10 +248,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -252,10 +247,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
public void onBindViewHolder(ViewHolder holder, int position) {
if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO
|| holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) {
@ -882,7 +891,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
} else if (holder.getItemViewType() == ViewType.SECTION_HEADER) {
bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
} else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
@@ -313,7 +305,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -313,7 +304,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
case ViewType.PERSONALIZED_SIGNIN_PROMO:
// fall through
case ViewType.PERSONALIZED_SYNC_PROMO:
@ -890,7 +899,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
break;
default:
// Other view holders don't have special recycling code.
@@ -339,7 +330,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -339,7 +329,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
updateHeader(!topLevelFoldersShowing());
};
@ -898,7 +907,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
populateTopLevelFoldersList();
mElements = new ArrayList<>();
@@ -354,8 +344,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -354,8 +343,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
mDelegate.getModel().removeObserver(mBookmarkModelObserver);
mDelegate.getSelectionDelegate().removeObserver(this);
mDelegate = null;
@ -907,7 +916,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
@Override
@@ -448,18 +436,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -448,18 +435,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
setOrder(mElements);
}
@ -926,7 +935,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
* promo header. This 0th index is null iff there is a promo header.
@@ -480,22 +456,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -480,22 +455,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
} else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
mPromoHeaderType = ViewType.INVALID;
} else {
@ -949,7 +958,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
boolean willShowPromo = hasPromoHeader();
@@ -618,7 +579,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@@ -618,7 +578,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
@VisibleForTesting
void simulateSignInForTests() {
@ -960,7 +969,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/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
@@ -18,42 +18,21 @@ import org.chromium.chrome.R;
@@ -18,42 +18,23 @@ import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
@ -973,12 +982,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
-import org.chromium.chrome.browser.sync.SyncService;
-import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
-import org.chromium.chrome.browser.ui.signin.SigninPromoController;
-import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
-import org.chromium.components.signin.AccountManagerFacade;
-import org.chromium.components.signin.AccountManagerFacadeProvider;
-import org.chromium.components.signin.AccountsChangeObserver;
-import org.chromium.components.signin.identitymanager.ConsentLevel;
-import org.chromium.components.signin.metrics.SigninAccessPoint;
+
/**
* Class that manages all the logic and UI behind the signin promo header in the bookmark
@ -1004,7 +1014,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Initializes the class. Note that this will start listening to signin related events and
@@ -62,42 +41,12 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
@@ -62,42 +43,12 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
BookmarkPromoHeader(Context context, Runnable promoHeaderChangeAction) {
mContext = context;
mPromoHeaderChangeAction = promoHeaderChangeAction;
@ -1047,7 +1057,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
/**
@@ -108,58 +57,11 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
@@ -108,58 +59,11 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
return mPromoState;
}
@ -1107,7 +1117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
private @SyncPromoState int calculatePromoState() {
@@ -167,90 +69,10 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
@@ -167,90 +71,10 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
return sPromoStateForTests;
}
@ -2473,6 +2483,24 @@ diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/brows
int SYNC_CONSENT_SHOWN = 3;
/** The user clicked on the continue button to continue with sync consent. */
int SYNC_CONSENT_ACCEPTED = 4;
diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
--- a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
+++ b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
@@ -26,14 +26,6 @@
android:src="@drawable/privacy_review_msbb_image"
android:importantForAccessibility="no" />
- <com.google.android.material.switchmaterial.SwitchMaterial
- android:id="@+id/msbb_switch"
- android:layout_marginHorizontal="16dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:showText="false"
- android:text="@string/url_keyed_anonymized_data_title" />
-
<org.chromium.chrome.browser.privacy_review.PrivacyReviewExplanationHeading
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/chrome/browser/signin/identity_services_provider_android.cc b/chrome/browser/signin/identity_services_provider_android.cc
--- a/chrome/browser/signin/identity_services_provider_android.cc
+++ b/chrome/browser/signin/identity_services_provider_android.cc

28
build/patches/User-agent-customization.patch
View file

@ -1063,10 +1063,10 @@ diff --git a/components/browser_ui/widget/android/java/src/org/chromium/componen
diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
@@ -275,6 +275,13 @@ blink::UserAgentBrandList GenerateBrandVersionList(
}
blink::UserAgentBrandVersion GetGreasedUserAgentBrandVersion(
@@ -332,6 +332,13 @@ blink::UserAgentMetadata GetUserAgentMetadata(PrefService* pref_service) {
enable_updated_grease_by_policy = pref_service->GetBoolean(
policy::policy_prefs::kUserAgentClientHintsGREASEUpdateEnabled);
}
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+ if (command_line->HasSwitch(kUserAgent)) {
+ std::string ua = command_line->GetSwitchValueASCII(kUserAgent);
@ -1074,9 +1074,9 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd
+ return metadata;
+ }
+
std::vector<int> permuted_order,
int seed,
absl::optional<std::string> maybe_greasey_brand,
metadata.brand_version_list =
GetBrandVersionList(enable_updated_grease_by_policy);
metadata.full_version = base::FeatureList::IsEnabled(
diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc
--- a/content/browser/renderer_host/navigation_controller_android.cc
+++ b/content/browser/renderer_host/navigation_controller_android.cc
@ -1123,14 +1123,14 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -38,6 +38,7 @@
#include "base/strings/stringprintf.h"
#include "base/system/sys_info.h"
#include "base/task/single_thread_task_runner.h"
@@ -15,6 +15,7 @@
#include "base/allocator/partition_alloc_features.h"
#include "base/allocator/partition_allocator/starscan/pcscan.h"
+#include "base/base_switches.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "base/trace_event/optional_trace_event.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/contains.h"
@@ -2697,6 +2698,9 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
!renderer_preferences_.user_agent_override.ua_metadata_override->mobile)
#endif