Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8948aebb authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Bump to 119.0.6045.160

parent 4804e89d

build.sh

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ root_dir=$(dirname "$(readlink -f "$0")") 
if [ ! -d "$chromium_dir" ]; then

    chromium_dir=$root_dir

fi

chromium_version="117.0.5938.156"

chromium_version="119.0.6045.160"

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

clean=0

gsync=0
@@ -96,12 +96,12 @@ patch() { 


    bromite_patches_list=$(cat "${root_dir}/build/bromite_patches_list.txt")

    for file in $bromite_patches_list; do

        git am -3 --ignore-whitespace "${root_dir}/build/bromite_patches/$file"

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/bromite_patches/$file"

    done



    e_patches_list=$(cat "${root_dir}/build/e_patches_list.txt")

    for file in $e_patches_list; do

        git am -3 --ignore-whitespace "${root_dir}/build/e_patches/$file"

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/e_patches/$file"

    done



    # Rename Chrome to Browser

build/bromite_patches/00AdblockPlus-add-blocking-in-service-workers.patch

+20 −20
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/browser/adblock/adblock_content_browser_client.cc

--- a/chrome/browser/adblock/adblock_content_browser_client.cc

+++ b/chrome/browser/adblock/adblock_content_browser_client.cc

@@ -45,6 +45,7 @@

@@ -43,6 +43,7 @@

 #include "content/public/browser/web_contents.h"

 #include "mojo/public/cpp/bindings/self_owned_receiver.h"

 #include "services/network/public/mojom/websocket.mojom.h"
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 #include "services/service_manager/public/cpp/binder_registry.h"

 #include "third_party/blink/public/common/loader/url_loader_throttle.h"

 

@@ -58,6 +59,29 @@

@@ -56,6 +57,29 @@

 

 namespace {
@@ -60,7 +60,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 bool IsFilteringNeeded(content::RenderFrameHost* frame) {

   if (frame) {

     auto* profile =

@@ -65,17 +89,7 @@ bool IsFilteringNeeded(content::RenderFrameHost* frame) {

@@ -63,17 +87,7 @@ bool IsFilteringNeeded(content::RenderFrameHost* frame) {

     if (profile) {

       content::RenderFrameHost* embedder = frame->GetOutermostMainFrameOrEmbedder();

       const auto& embedder_url = embedder->GetLastCommittedURL();
@@ -79,7 +79,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
     }

   }

   return false;

@@ -90,6 +104,8 @@ class AdblockContextData : public base::SupportsUserData::Data {

@@ -88,6 +102,8 @@ class AdblockContextData : public base::SupportsUserData::Data {

 

   static void StartProxying(

       Profile* profile,
@@ -88,7 +88,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
       content::RenderFrameHost* frame,

       int render_process_id,

       mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,

@@ -102,8 +118,6 @@ class AdblockContextData : public base::SupportsUserData::Data {

@@ -100,8 +116,6 @@ class AdblockContextData : public base::SupportsUserData::Data {

       self = new AdblockContextData();

       profile->SetUserData(kAdblockContextUserDataKey, base::WrapUnique(self));

     }
@@ -97,7 +97,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
     adblock::AdblockURLLoaderFactoryConfig config{

         adblock::SubscriptionServiceFactory::GetForBrowserContext(

             browser_context),

@@ -115,8 +129,9 @@ class AdblockContextData : public base::SupportsUserData::Data {

@@ -113,8 +127,9 @@ class AdblockContextData : public base::SupportsUserData::Data {

             browser_context)};

     auto proxy = std::make_unique<adblock::AdblockURLLoaderFactory>(

         std::move(config),
@@ -108,7 +108,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
         std::move(receiver), std::move(target_factory),

         embedder_support::GetUserAgent(),

         base::BindOnce(&AdblockContextData::RemoveProxy,

@@ -157,47 +172,50 @@ void AdblockContentBrowserClient::ForceAdblockProxyForTesting() {

@@ -155,47 +170,50 @@ void AdblockContentBrowserClient::ForceAdblockProxyForTesting() {

 #endif

 

 bool AdblockContentBrowserClient::WillInterceptWebSocket(
@@ -176,7 +176,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
   auto* subscription_service =

       adblock::SubscriptionServiceFactory::GetForBrowserContext(

           browser_context);

@@ -205,33 +223,33 @@ void AdblockContentBrowserClient::CreateWebSocketInternal(

@@ -203,33 +221,33 @@ void AdblockContentBrowserClient::CreateWebSocketInternal(

       adblock::ResourceClassificationRunnerFactory::GetForBrowserContext(

           browser_context);

   classification_runner->CheckRequestFilterMatchForWebSocket(
@@ -218,7 +218,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
           std::move(handshake_client));

       return;

     }

@@ -248,6 +266,72 @@ void AdblockContentBrowserClient::OnWebSocketFilterCheckCompleted(

@@ -246,6 +264,72 @@ void AdblockContentBrowserClient::OnWebSocketFilterCheckCompleted(

   VLOG(1) << "[eyeo] Web socket blocked for " << url;

 }
@@ -291,7 +291,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

     content::BrowserContext* browser_context,

     content::RenderFrameHost* frame,

@@ -271,24 +355,12 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

@@ -269,24 +353,12 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

           navigation_id, ukm_source_id, factory_receiver, header_client,

           bypass_redirect_checks, disable_secure_dns, factory_override,

           navigation_response_task_runner);
@@ -320,7 +320,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b 
 

   bool use_test_loader = false;

 #ifdef EYEO_INTERCEPT_DEBUG_URL

@@ -307,7 +379,7 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

@@ -305,7 +377,7 @@ bool AdblockContentBrowserClient::WillCreateURLLoaderFactory(

     mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory_remote;

     *factory_receiver = target_factory_remote.InitWithNewPipeAndPassReceiver();

     AdblockContextData::StartProxying(
@@ -401,7 +401,7 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.h b/chrome/br 
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -6252,7 +6252,9 @@ ChromeContentBrowserClient::

@@ -6330,7 +6330,9 @@ ChromeContentBrowserClient::

 }

 

 bool ChromeContentBrowserClient::WillInterceptWebSocket(
@@ -412,7 +412,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 
 #if BUILDFLAG(ENABLE_EXTENSIONS)

   if (!frame) {

     return false;

@@ -6273,9 +6275,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(

@@ -6351,9 +6353,11 @@ bool ChromeContentBrowserClient::WillInterceptWebSocket(

 }

 

 void ChromeContentBrowserClient::CreateWebSocket(
@@ -427,7 +427,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch 
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -610,11 +610,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

@@ -624,11 +624,15 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

   CreateURLLoaderHandlerForServiceWorkerNavigationPreload(

       int frame_tree_node_id,

       const network::ResourceRequest& resource_request) override;
@@ -495,7 +495,7 @@ diff --git a/components/adblock/content/browser/adblock_url_loader_factory.h b/c 
 

 namespace adblock {

 

@@ -49,6 +50,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

@@ -57,6 +58,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

 

   AdblockURLLoaderFactory(

       AdblockURLLoaderFactoryConfig config,
@@ -503,7 +503,7 @@ diff --git a/components/adblock/content/browser/adblock_url_loader_factory.h b/c 
       content::GlobalRenderFrameHostId host_id,

       mojo::PendingReceiver<network::mojom::URLLoaderFactory> receiver,

       mojo::PendingRemote<network::mojom::URLLoaderFactory> target_factory,

@@ -78,6 +80,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

@@ -86,6 +88,7 @@ class AdblockURLLoaderFactory : public network::mojom::URLLoaderFactory {

   void MaybeDestroySelf();

 

   AdblockURLLoaderFactoryConfig config_;
@@ -683,7 +683,7 @@ diff --git a/content/browser/websockets/websocket_connector_impl.cc b/content/br 
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc

--- a/content/public/browser/content_browser_client.cc

+++ b/content/public/browser/content_browser_client.cc

@@ -967,7 +967,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(

@@ -998,7 +998,7 @@ bool ContentBrowserClient::WillCreateURLLoaderFactory(

   return false;

 }
@@ -692,7 +692,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b 
   return false;

 }

 

@@ -976,9 +976,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {

@@ -1007,9 +1007,11 @@ uint32_t ContentBrowserClient::GetWebSocketOptions(RenderFrameHost* frame) {

 }

 

 void ContentBrowserClient::CreateWebSocket(
@@ -707,7 +707,7 @@ diff --git a/content/public/browser/content_browser_client.cc b/content/public/b 
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h

--- a/content/public/browser/content_browser_client.h

+++ b/content/public/browser/content_browser_client.h

@@ -1746,7 +1746,7 @@ class CONTENT_EXPORT ContentBrowserClient {

@@ -1791,7 +1791,7 @@ class CONTENT_EXPORT ContentBrowserClient {

       scoped_refptr<base::SequencedTaskRunner> navigation_response_task_runner);

 

   // Returns true when the embedder wants to intercept a websocket connection.
@@ -716,7 +716,7 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/br 
 

   // Returns the WebSocket creation options.

   virtual uint32_t GetWebSocketOptions(RenderFrameHost* frame);

@@ -1768,9 +1768,11 @@ class CONTENT_EXPORT ContentBrowserClient {

@@ -1813,9 +1813,11 @@ class CONTENT_EXPORT ContentBrowserClient {

   // Always called on the UI thread and only when the Network Service is

   // enabled.

   virtual void CreateWebSocket(

build/bromite_patches/Enable-ImprovedBookmarks-by-default.patch→build/bromite_patches/00Enable-ImprovedBookmarks-by-default.patch

+25 −33
Original line number Diff line number Diff line
@@ -4,36 +4,28 @@ Subject: Enable ImprovedBookmarks by default 


License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

---

 chrome/android/java/res/layout/bookmark_search_box_row.xml  | 6 +++---

 chrome/android/java/res/layout/bookmark_search_box_row.xml    | 4 ++--

 .../chromium/chrome/browser/bookmarks/BookmarkFeatures.java   | 2 +-

 .../browser/bookmarks/BookmarkSearchBoxRowViewBinder.java     | 2 ++

 .../chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java    | 2 +-

 .../chromium/chrome/browser/bookmarks/BookmarkUtils.java    | 3 ++-

 .../org/chromium/chrome/browser/bookmarks/BookmarkUtils.java  | 3 ++-

 chrome/browser/flags/android/chrome_feature_list.cc           | 2 +-

 6 files changed, 10 insertions(+), 7 deletions(-)

 6 files changed, 9 insertions(+), 6 deletions(-)



diff --git a/chrome/android/java/res/layout/bookmark_search_box_row.xml b/chrome/android/java/res/layout/bookmark_search_box_row.xml

--- a/chrome/android/java/res/layout/bookmark_search_box_row.xml

+++ b/chrome/android/java/res/layout/bookmark_search_box_row.xml

@@ -31,9 +31,9 @@ found in the LICENSE file.

       android:textAppearance="@style/TextAppearance.TextLarge.Primary" />

@@ -58,8 +58,8 @@ found in the LICENSE file.

 

   <LinearLayout

-        android:layout_height="48dp"

+        android:layout_height="wrap_content"

     android:layout_width="match_parent"

-    android:layout_height="48dp"

-    android:layout_marginTop="6dp"

+    android:layout_height="wrap_content"

+    android:layout_marginTop="0dp"

     android:orientation="horizontal">

 

     <org.chromium.components.browser_ui.widget.chips.ChipView

@@ -43,4 +43,4 @@ found in the LICENSE file.

 

     </LinearLayout>

 

-</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>

\ No newline at end of file

+</org.chromium.chrome.browser.bookmarks.BookmarkSearchBoxRow>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkFeatures.java
@@ -57,25 +49,25 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 
 

 import androidx.annotation.DrawableRes;

 import androidx.annotation.StringRes;

@@ -20,6 +21,7 @@ class BookmarkSearchBoxRowViewBinder {

     static void bind(PropertyModel model, View view, PropertyKey key) {

@@ -53,6 +54,7 @@ class BookmarkSearchBoxRowViewBinder {

     private void bindInternal(PropertyModel model, View view, PropertyKey key) {

         BookmarkSearchBoxRow row = (BookmarkSearchBoxRow) view;

         ChipView shoppingChip = view.findViewById(R.id.shopping_filter_chip);

+        shoppingChip.setVisibility(ViewGroup.GONE);

         if (key == BookmarkSearchBoxRowProperties.QUERY_CALLBACK) {

             row.setQueryCallback(model.get(BookmarkSearchBoxRowProperties.QUERY_CALLBACK));

         } else if (key == BookmarkSearchBoxRowProperties.SHOPPING_CHIP_VISIBILITY) {

         if (key == BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK) {

             Callback<String> callback =

                     wrapCallback(model, BookmarkSearchBoxRowProperties.SEARCH_TEXT_CHANGE_CALLBACK);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUiPrefs.java

@@ -18,7 +18,7 @@ import java.lang.annotation.RetentionPolicy;

@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;

  */

 public class BookmarkUiPrefs {

     private static final @BookmarkRowDisplayPref int INITIAL_BOOKMARK_ROW_DISPLAY_PREF =

-            BookmarkRowDisplayPref.VISUAL;

+            BookmarkRowDisplayPref.COMPACT;

     private static final @BookmarkRowSortOrder int INITIAL_BOOKMARK_ROW_SORT_ORDER =

             BookmarkRowSortOrder.REVERSE_CHRONOLOGICAL;

             BookmarkRowSortOrder.MANUAL;

 

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkUtils.java
@@ -100,14 +92,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm 
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

@@ -495,7 +495,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification,

@@ -509,7 +509,7 @@ BASE_FEATURE(kAndroidSearchEngineChoiceNotification,

 

 BASE_FEATURE(kAndroidImprovedBookmarks,

              "AndroidImprovedBookmarks",

-             base::FEATURE_DISABLED_BY_DEFAULT);

+             base::FEATURE_ENABLED_BY_DEFAULT);

 

 BASE_FEATURE(kAnimatedImageDragShadow,

              "AnimatedImageDragShadow",

 BASE_FEATURE(kAndroidNoVisibleHintForTablets,

              "AndroidNoVisibleHintForTablets",

--

2.25.1

build/bromite_patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch

+4484 −618

File changed.

Preview size limit exceeded, changes collapsed.

build/bromite_patches/00Fix-eyeo-Browser-Ad-filtering-patches.patch

deleted100644 → 0
+0 −146
Original line number Diff line number Diff line 
From: uazo <uazo@users.noreply.github.com>

Date: Wed, 6 Sep 2023 15:25:18 +0000

Subject: Fix eyeo Browser Ad filtering patches



---

 chrome/browser/BUILD.gn                                 | 4 ----

 chrome/browser/client_hints/client_hints_browsertest.cc | 7 +------

 chrome/browser/extensions/BUILD.gn                      | 4 ----

 chrome/browser/preferences/BUILD.gn                     | 4 ----

 chrome/browser/ui/BUILD.gn                              | 6 ------

 chrome/browser/ui/tab_helpers.cc                        | 4 ----

 extensions/common/mojom/api_permission_id.mojom         | 3 ---

 7 files changed, 1 insertion(+), 31 deletions(-)



diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

--- a/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

@@ -2085,12 +2085,8 @@ static_library("browser") {

     "//chrome/common/notifications",

     "//chrome/installer/util:with_no_strings",

     "//chrome/services/speech/buildflags",

-<<<<<<< HEAD

-=======

-    "//chromeos/components/kiosk",

     "//components/adblock/content:browser",

     "//components/adblock/core/converter",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/assist_ranker",

     "//components/autofill/content/browser",

     "//components/autofill/core/browser",

diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc

--- a/chrome/browser/client_hints/client_hints_browsertest.cc

+++ b/chrome/browser/client_hints/client_hints_browsertest.cc

@@ -652,17 +652,12 @@ class ClientHintsBrowserTest : public policy::PolicyTest {

     // Force-enable the ClientHintsFormFactor feature, so that the header is

     // represented in the various header counts.

     feature_list->InitializeFromCommandLine(

-<<<<<<< HEAD

-        "UserAgentClientHint,CriticalClientHint,AcceptCHFrame,"

-        "ClientHintsFormFactor",

-        "");

-=======

         "UserAgentClientHint,CriticalClientHint,AcceptCHFrame",

+        "ClientHintsFormFactor",

 	// Disabling AdblockPlus because the async implementation of

         // AdblockURLLoaderThrottle::WillStartRequest confuses

         // ThirdPartyURLLoaderInterceptor.

         "AdblockPlus");

->>>>>>> 9402d5c48c0e8... Squashed commits

     return feature_list;

   }

 

diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn

--- a/chrome/browser/extensions/BUILD.gn

+++ b/chrome/browser/extensions/BUILD.gn

@@ -821,11 +821,7 @@ static_library("extensions") {

     "//chrome/browser/safe_browsing:metrics_collector",

     "//chrome/browser/ui/tabs:tab_enums",

     "//chrome/browser/web_applications",

-<<<<<<< HEAD

-=======

-    "//chromeos/components/kiosk",

     "//components/adblock/content:browser",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/cbor:cbor",

     "//components/commerce/core:pref_names",

     "//components/device_reauth",

diff --git a/chrome/browser/preferences/BUILD.gn b/chrome/browser/preferences/BUILD.gn

--- a/chrome/browser/preferences/BUILD.gn

+++ b/chrome/browser/preferences/BUILD.gn

@@ -38,12 +38,8 @@ android_library("java") {

 # TODO(chouinard,estade): Consider breaking this target up into a different target for each pref file.

 java_cpp_strings("java_pref_names_srcjar") {

   sources = [

-<<<<<<< HEAD

     "//chrome/common/pref_names.h",

-=======

-    "//chrome/common/pref_names.cc",

     "//components/adblock/core/common/adblock_prefs.cc",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/autofill/core/common/autofill_prefs.cc",

     "//components/commerce/core/pref_names.cc",

     "//components/dom_distiller/core/pref_names.cc",

diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

--- a/chrome/browser/ui/BUILD.gn

+++ b/chrome/browser/ui/BUILD.gn

@@ -447,11 +447,8 @@ static_library("ui") {

     "//chrome/browser/storage_access_api",

     "//chrome/browser/ui/side_panel:side_panel_enums",

     "//chrome/browser/ui/webui:configs",

-<<<<<<< HEAD

     "//chrome/browser/ui/webui/location_internals:mojo_bindings",

-=======

     "//chrome/browser/ui/webui/adblock_internals:mojo_bindings",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//chrome/browser/ui/webui/omnibox:mojo_bindings",

     "//chrome/browser/ui/webui/segmentation_internals:mojo_bindings",

     "//chrome/browser/ui/webui/suggest_internals:mojo_bindings",

@@ -467,11 +464,8 @@ static_library("ui") {

     "//components/about_ui",

     "//components/access_code_cast/common:metrics",

     "//components/account_id",

-<<<<<<< HEAD

     "//components/autofill/content/browser",

-=======

     "//components/adblock/content:browser",

->>>>>>> 9402d5c48c0e8... Squashed commits

     "//components/autofill/content/browser:risk_proto",

     "//components/autofill/core/browser",

     "//components/blocked_content",

diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc

--- a/chrome/browser/ui/tab_helpers.cc

+++ b/chrome/browser/ui/tab_helpers.cc

@@ -17,14 +17,10 @@

 #include "base/trace_event/trace_event.h"

 #include "build/build_config.h"

 #include "build/chromeos_buildflags.h"

-<<<<<<< HEAD

 #include "chrome/browser/3pcd/heuristics/opener_heuristic_tab_helper.h"

-=======

-#include "chrome/browser/3pcd_heuristics/opener_heuristic_tab_helper.h"

 #include "chrome/browser/adblock/element_hider_factory.h"

 #include "chrome/browser/adblock/sitekey_storage_factory.h"

 #include "chrome/browser/adblock/subscription_service_factory.h"

->>>>>>> 9402d5c48c0e8... Squashed commits

 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

 #include "chrome/browser/breadcrumbs/breadcrumb_manager_tab_helper.h"

 #include "chrome/browser/browser_process.h"

diff --git a/extensions/common/mojom/api_permission_id.mojom b/extensions/common/mojom/api_permission_id.mojom

--- a/extensions/common/mojom/api_permission_id.mojom

+++ b/extensions/common/mojom/api_permission_id.mojom

@@ -278,12 +278,9 @@ enum APIPermissionID {

   kSmartCardProviderPrivate = 247,

   kChromeOSEvents = 248,

   kChromeOSAttachedDeviceInfo = 249,

-<<<<<<< HEAD

   kReadingList = 250,

-=======

   kAdblockPrivate = 999,

   kEyeoFilteringPrivate = 1000,

->>>>>>> 9402d5c48c0e8... Squashed commits

 

   // Add new entries at the end of the enum and be sure to update the

   // "ExtensionPermission3" enum in tools/metrics/histograms/enums.xml

--

2.25.1