diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni
index d32d76fa7e6..cb7385fd45c 100644
--- a/android/brave_java_resources.gni
+++ b/android/brave_java_resources.gni
@@ -46,8 +46,6 @@ brave_java_resources = [
"java/res/drawable-hdpi/ic_ad_free_videos.png",
"java/res/drawable-hdpi/ic_brave_onboarding.png",
"java/res/drawable-hdpi/ic_chrome.png",
- "java/res/drawable-hdpi/ic_cookie.png",
- "java/res/drawable-hdpi/ic_cookie_background.png",
"java/res/drawable-hdpi/ic_cross_modal.png",
"java/res/drawable-hdpi/ic_delete_white_24dp.png",
"java/res/drawable-hdpi/ic_expand_less_black_24dp.png",
@@ -112,8 +110,6 @@ brave_java_resources = [
"java/res/drawable-mdpi/ic_ad_free_videos.png",
"java/res/drawable-mdpi/ic_brave_onboarding.png",
"java/res/drawable-mdpi/ic_chrome.png",
- "java/res/drawable-mdpi/ic_cookie.png",
- "java/res/drawable-mdpi/ic_cookie_background.png",
"java/res/drawable-mdpi/ic_cross_modal.png",
"java/res/drawable-mdpi/ic_delete_white_24dp.png",
"java/res/drawable-mdpi/ic_expand_less_black_24dp.png",
@@ -143,13 +139,8 @@ brave_java_resources = [
"java/res/drawable-mdpi/uphold_green.png",
"java/res/drawable-mdpi/uphold_white.png",
"java/res/drawable-mdpi/yandex.png",
- "java/res/drawable-night-hdpi/ic_cookie_background.png",
- "java/res/drawable-night-mdpi/ic_cookie_background.png",
"java/res/drawable-night-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png",
"java/res/drawable-night-nodpi/widget_preview.png",
- "java/res/drawable-night-xhdpi/ic_cookie_background.png",
- "java/res/drawable-night-xxhdpi/ic_cookie_background.png",
- "java/res/drawable-night-xxxhdpi/ic_cookie_background.png",
"java/res/drawable-night/bookmark_empty_state_illustration.xml",
"java/res/drawable-night/history_empty_state_illustration.xml",
"java/res/drawable-night/phone_recent_tab_empty_state_illustration.xml",
@@ -196,8 +187,6 @@ brave_java_resources = [
"java/res/drawable-xhdpi/ic_ad_free_videos.png",
"java/res/drawable-xhdpi/ic_brave_onboarding.png",
"java/res/drawable-xhdpi/ic_chrome.png",
- "java/res/drawable-xhdpi/ic_cookie.png",
- "java/res/drawable-xhdpi/ic_cookie_background.png",
"java/res/drawable-xhdpi/ic_cross_modal.png",
"java/res/drawable-xhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xhdpi/ic_expand_less_black_24dp.png",
@@ -261,8 +250,6 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/ic_ad_free_videos.png",
"java/res/drawable-xxhdpi/ic_brave_onboarding.png",
"java/res/drawable-xxhdpi/ic_chrome.png",
- "java/res/drawable-xxhdpi/ic_cookie.png",
- "java/res/drawable-xxhdpi/ic_cookie_background.png",
"java/res/drawable-xxhdpi/ic_cross_modal.png",
"java/res/drawable-xxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png",
@@ -325,8 +312,6 @@ brave_java_resources = [
"java/res/drawable-xxxhdpi/ic_ad_free_videos.png",
"java/res/drawable-xxxhdpi/ic_brave_onboarding.png",
"java/res/drawable-xxxhdpi/ic_chrome.png",
- "java/res/drawable-xxxhdpi/ic_cookie.png",
- "java/res/drawable-xxxhdpi/ic_cookie_background.png",
"java/res/drawable-xxxhdpi/ic_cross_modal.png",
"java/res/drawable-xxxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png",
@@ -421,7 +406,6 @@ brave_java_resources = [
"java/res/drawable/chip_outline_selected.xml",
"java/res/drawable/circle_shimmer.xml",
"java/res/drawable/circular_progress.xml",
- "java/res/drawable/cookie_consent_tooltip_background.xml",
"java/res/drawable/country_spinner_background.xml",
"java/res/drawable/crypto_wallet_blue_button.xml",
"java/res/drawable/crypto_wallet_hollow_button.xml",
@@ -777,7 +761,6 @@ brave_java_resources = [
"java/res/layout/activity_welcome_onboarding.xml",
"java/res/layout/application_item_layout.xml",
"java/res/layout/approve_tx_bottom_sheet.xml",
- "java/res/layout/block_cookie_consent_notices_tooltip.xml",
"java/res/layout/bottom_toolbar.xml",
"java/res/layout/bottom_toolbar_browsing.xml",
"java/res/layout/bottom_toolbar_menu_button.xml",
diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni
index 04e9999a9e4..91e7e4f17d3 100644
--- a/android/brave_java_sources.gni
+++ b/android/brave_java_sources.gni
@@ -392,7 +392,6 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/ContentFilteringAdapter.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java",
- "../../brave/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
index b0d0643fd7a..245d56d6b12 100644
--- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java
+++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -1539,13 +1539,6 @@ public abstract class BraveActivity extends ChromeActivity
}
}
- public void dismissCookieConsent() {
- BraveToolbarLayoutImpl layout = getBraveToolbarLayout();
- if (layout != null) {
- layout.dismissCookieConsent();
- }
- }
-
public void openRewardsPanel() {
BraveToolbarLayoutImpl layout = getBraveToolbarLayout();
if (layout != null) {
diff --git a/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java b/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java
deleted file mode 100644
index da25198cf8c..00000000000
--- a/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (c) 2022 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-package org.chromium.chrome.browser.shields;
-
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.base.annotations.NativeMethods;
-import org.chromium.brave_shields.mojom.CookieListOptInPageAndroidHandler;
-import org.chromium.chrome.browser.crypto_wallet.util.Utils;
-import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.mojo.bindings.ConnectionErrorHandler;
-import org.chromium.mojo.bindings.Interface;
-import org.chromium.mojo.bindings.Interface.Proxy.Handler;
-import org.chromium.mojo.system.MessagePipeHandle;
-import org.chromium.mojo.system.impl.CoreImpl;
-
-@JNINamespace("chrome::android")
-public class CookieListOptInServiceFactory {
- private static final Object lock = new Object();
- private static CookieListOptInServiceFactory instance;
-
- public static CookieListOptInServiceFactory getInstance() {
- synchronized (lock) {
- if (instance == null) {
- instance = new CookieListOptInServiceFactory();
- }
- }
- return instance;
- }
-
- private CookieListOptInServiceFactory() {}
-
- public CookieListOptInPageAndroidHandler getCookieListOptInPageAndroidHandler(
- ConnectionErrorHandler connectionErrorHandler) {
- Profile profile = Utils.getProfile(false); // Always use regular profile
- if (profile == null) {
- return null;
- }
- long nativeHandle =
- CookieListOptInServiceFactoryJni.get().getInterfaceToCookieListOptInService(
- profile);
- if (nativeHandle == -1) {
- return null;
- }
- MessagePipeHandle handle = wrapNativeHandle(nativeHandle);
- CookieListOptInPageAndroidHandler cookieListOptInPageAndroidHandler =
- CookieListOptInPageAndroidHandler.MANAGER.attachProxy(handle, 0);
- Handler handler = ((Interface.Proxy) cookieListOptInPageAndroidHandler).getProxyHandler();
- handler.setErrorHandler(connectionErrorHandler);
-
- return cookieListOptInPageAndroidHandler;
- }
-
- private MessagePipeHandle wrapNativeHandle(long nativeHandle) {
- return CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle();
- }
-
- @NativeMethods
- interface Natives {
- long getInterfaceToCookieListOptInService(Profile profile);
- }
-}
diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
index 3f3d68e1686..a40035bd35f 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
@@ -195,26 +195,6 @@ public class BraveToolbarManager extends ToolbarManager {
}
};
HomepageManager.getInstance().addListener(mBraveHomepageStateListener);
- mLayoutStateProviderSupplier.onAvailable(
- mCallbackController.makeCancelable(this::setLayoutStateProvider));
- }
-
- private void setLayoutStateProvider(LayoutStateProvider layoutStateProvider) {
- mLayoutStateObserver = new LayoutStateProvider.LayoutStateObserver() {
- @Override
- public void onStartedShowing(@LayoutType int layoutType) {
- if (layoutType == LayoutType.TAB_SWITCHER) {
- try {
- BraveActivity braveActivity = BraveActivity.getBraveActivity();
- braveActivity.dismissCookieConsent();
- } catch (BraveActivity.BraveActivityNotFoundException e) {
- Log.e(TAG, "setLayoutStateProvider onStartedShowing click " + e);
- }
- }
- }
- };
- mLayoutStateProvider = layoutStateProvider;
- mLayoutStateProvider.addObserver(mLayoutStateObserver);
}
@Override
diff --git a/android/java/res/drawable-hdpi/ic_cookie.png b/android/java/res/drawable-hdpi/ic_cookie.png
deleted file mode 100644
index 4d71dedcaab..00000000000
Binary files a/android/java/res/drawable-hdpi/ic_cookie.png and /dev/null differ
diff --git a/android/java/res/drawable-hdpi/ic_cookie_background.png b/android/java/res/drawable-hdpi/ic_cookie_background.png
deleted file mode 100644
index 905507952d5..00000000000
Binary files a/android/java/res/drawable-hdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-mdpi/ic_cookie.png b/android/java/res/drawable-mdpi/ic_cookie.png
deleted file mode 100644
index af53457ccf2..00000000000
Binary files a/android/java/res/drawable-mdpi/ic_cookie.png and /dev/null differ
diff --git a/android/java/res/drawable-mdpi/ic_cookie_background.png b/android/java/res/drawable-mdpi/ic_cookie_background.png
deleted file mode 100644
index 73a31ec00d0..00000000000
Binary files a/android/java/res/drawable-mdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-night-hdpi/ic_cookie_background.png b/android/java/res/drawable-night-hdpi/ic_cookie_background.png
deleted file mode 100644
index aa445c34837..00000000000
Binary files a/android/java/res/drawable-night-hdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-night-mdpi/ic_cookie_background.png b/android/java/res/drawable-night-mdpi/ic_cookie_background.png
deleted file mode 100644
index d30f0c67d0d..00000000000
Binary files a/android/java/res/drawable-night-mdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-night-xhdpi/ic_cookie_background.png b/android/java/res/drawable-night-xhdpi/ic_cookie_background.png
deleted file mode 100644
index 959c3b247b7..00000000000
Binary files a/android/java/res/drawable-night-xhdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-night-xxhdpi/ic_cookie_background.png b/android/java/res/drawable-night-xxhdpi/ic_cookie_background.png
deleted file mode 100644
index 1149af0b14b..00000000000
Binary files a/android/java/res/drawable-night-xxhdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-night-xxxhdpi/ic_cookie_background.png b/android/java/res/drawable-night-xxxhdpi/ic_cookie_background.png
deleted file mode 100644
index 663d228459c..00000000000
Binary files a/android/java/res/drawable-night-xxxhdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-xhdpi/ic_cookie.png b/android/java/res/drawable-xhdpi/ic_cookie.png
deleted file mode 100644
index b7581f873f6..00000000000
Binary files a/android/java/res/drawable-xhdpi/ic_cookie.png and /dev/null differ
diff --git a/android/java/res/drawable-xhdpi/ic_cookie_background.png b/android/java/res/drawable-xhdpi/ic_cookie_background.png
deleted file mode 100644
index 90c0c1c3703..00000000000
Binary files a/android/java/res/drawable-xhdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-xxhdpi/ic_cookie.png b/android/java/res/drawable-xxhdpi/ic_cookie.png
deleted file mode 100644
index c6567c3e30a..00000000000
Binary files a/android/java/res/drawable-xxhdpi/ic_cookie.png and /dev/null differ
diff --git a/android/java/res/drawable-xxhdpi/ic_cookie_background.png b/android/java/res/drawable-xxhdpi/ic_cookie_background.png
deleted file mode 100644
index a3a0a456bdd..00000000000
Binary files a/android/java/res/drawable-xxhdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable-xxxhdpi/ic_cookie.png b/android/java/res/drawable-xxxhdpi/ic_cookie.png
deleted file mode 100644
index dce0048879c..00000000000
Binary files a/android/java/res/drawable-xxxhdpi/ic_cookie.png and /dev/null differ
diff --git a/android/java/res/drawable-xxxhdpi/ic_cookie_background.png b/android/java/res/drawable-xxxhdpi/ic_cookie_background.png
deleted file mode 100644
index 8366d99f30e..00000000000
Binary files a/android/java/res/drawable-xxxhdpi/ic_cookie_background.png and /dev/null differ
diff --git a/android/java/res/drawable/cookie_consent_tooltip_background.xml b/android/java/res/drawable/cookie_consent_tooltip_background.xml
deleted file mode 100644
index 4de5d86a1f9..00000000000
--- a/android/java/res/drawable/cookie_consent_tooltip_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/android/java/res/layout/block_cookie_consent_notices_tooltip.xml b/android/java/res/layout/block_cookie_consent_notices_tooltip.xml
deleted file mode 100644
index 6f03de2c0bb..00000000000
--- a/android/java/res/layout/block_cookie_consent_notices_tooltip.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/android/java/res/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml
index 53f297ed442..061b433153b 100644
--- a/android/java/res/values-night/brave_colors.xml
+++ b/android/java/res/values-night/brave_colors.xml
@@ -155,9 +155,6 @@
@android:color/white
- #F0F2FF
- #1E2029
-
#F21E2029
#405E6175
diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml
index 32f40c909cb..d2787613852 100644
--- a/android/java/res/values/brave_colors.xml
+++ b/android/java/res/values/brave_colors.xml
@@ -272,9 +272,6 @@
#212529
#FFD43B
- #212529
- @android:color/white
-
#F2FFFFFF
#40AEB1C2
diff --git a/browser/brave_shields/android/cookie_list_opt_in_service_factory_android.cc b/browser/brave_shields/android/cookie_list_opt_in_service_factory_android.cc
deleted file mode 100644
index 0136d8e0ecd..00000000000
--- a/browser/brave_shields/android/cookie_list_opt_in_service_factory_android.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright (c) 2022 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "base/android/jni_android.h"
-#include "brave/browser/brave_shields/cookie_list_opt_in_service_factory.h"
-#include "brave/build/android/jni_headers/CookieListOptInServiceFactory_jni.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_android.h"
-#include "mojo/public/cpp/bindings/pending_receiver.h"
-
-namespace chrome {
-namespace android {
-static jlong
-JNI_CookieListOptInServiceFactory_GetInterfaceToCookieListOptInService(
- JNIEnv* env,
- const base::android::JavaParamRef& profile_android) {
- auto* profile = ProfileAndroid::FromProfileAndroid(profile_android);
- if (profile == nullptr)
- return static_cast(-1);
-
- auto pending = brave_shields::CookieListOptInServiceFactory::GetInstance()
- ->GetForContext(profile);
-
- return static_cast(pending.PassPipe().release().value());
-}
-
-} // namespace android
-} // namespace chrome
diff --git a/browser/brave_shields/sources.gni b/browser/brave_shields/sources.gni
index e7a19b81984..a4eb64263d3 100644
--- a/browser/brave_shields/sources.gni
+++ b/browser/brave_shields/sources.gni
@@ -39,7 +39,6 @@ brave_browser_brave_shields_deps = [
if (is_android) {
brave_browser_brave_shields_sources += [
- "//brave/browser/brave_shields/android/cookie_list_opt_in_service_factory_android.cc",
"//brave/browser/brave_shields/android/filter_list_service_factory_android.cc",
"//brave/browser/brave_shields/brave_shields_web_contents_observer_android.cc",
]
diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
index 9ce815441b1..f85f2fdc0da 100644
--- a/browser/ui/android/strings/android_brave_strings.grd
+++ b/browser/ui/android/strings/android_brave_strings.grd
@@ -3351,15 +3351,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne
Enter your Brave Wallet password
-
- Got it
-
-
- Brave is blocking cookie consent notices.
-
-
- Brave already blocks harmful cookies. Now, we automatically block those annoying cookie consent notices, too.
-
Note that Brave can't verify what will happen if you sign. A signature could authorize nearly any operation in your account or on your behalf, including (but not limited to) giving total control of your account and crypto assets to the site making the request. Only sign if you're sure you want to take this action, and trust the requesting site.
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index 2545589d161..4b14fef7b5e 100644
--- a/build/android/BUILD.gn
+++ b/build/android/BUILD.gn
@@ -234,7 +234,6 @@ generate_jni("jni_headers") {
"//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
"//brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
"//brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
- "//brave/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
diff --git a/build/android/config.gni b/build/android/config.gni
index 79b426b48d2..a2755e3c4f8 100644
--- a/build/android/config.gni
+++ b/build/android/config.gni
@@ -132,7 +132,6 @@ brave_jni_headers_sources = [
"//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
"//brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
"//brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
- "//brave/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",