chore: fix browser_view patch harder

electron · Feb 26, 2024 · 3efbfb2 · 3efbfb2
1 parent 1f115ab
commit 3efbfb2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/patches/chromium/chore_add_buildflag_guard_around_new_include.patch b/patches/chromium/chore_add_buildflag_guard_around_new_include.patch
@@ -9,7 +9,7 @@ This is an experimental commit; but if it's successful,
 This patch should be upstreamed and then removed from electron's code.
 
 diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
-index 2a1498da8c9ce693403800d4c4b52fac6a7430e1..3121dbc0721ecfc4c0d5a586673bd139f44569ce 100644
+index 2a1498da8c9ce693403800d4c4b52fac6a7430e1..95c1b5df170b368d58e57e22561da9ba7e83e1d8 100644
 --- a/chrome/browser/ui/views/frame/browser_view.h
 +++ b/chrome/browser/ui/views/frame/browser_view.h
 @@ -41,9 +41,7 @@
@@ -22,10 +22,12 @@ index 2a1498da8c9ce693403800d4c4b52fac6a7430e1..3121dbc0721ecfc4c0d5a586673bd139
  #include "components/user_education/common/feature_promo_controller.h"
  #include "components/user_education/common/feature_promo_handle.h"
  #include "components/webapps/browser/banners/app_banner_manager.h"
-@@ -64,9 +62,14 @@
+@@ -63,10 +61,15 @@
+ #include "ui/views/widget/widget_observer.h"
  #include "ui/views/window/client_view.h"
 
- #if BUILDFLAG(ENTERPRISE_WATERMARK)
+-#if BUILDFLAG(ENTERPRISE_WATERMARK)
++#if 0
 +#include "components/enterprise/buildflags/buildflags.h"
  #include "chrome/browser/enterprise/watermark/watermark_view.h"
  #endif
@@ -37,3 +39,23 @@ index 2a1498da8c9ce693403800d4c4b52fac6a7430e1..3121dbc0721ecfc4c0d5a586673bd139
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  #include "ui/compositor/throughput_tracker.h"
  #endif
+@@ -446,7 +449,7 @@ class BrowserView : public BrowserWindow,
+
+   void UpdateWebAppStatusIconsVisiblity();
+
+-#if BUILDFLAG(ENTERPRISE_WATERMARK)
++#if 0
+   // Sets the watermark string to the value specified in text if the view is
+   // not null.
+   void SetWatermarkString(const std::string& text);
+@@ -1182,8 +1185,10 @@ class BrowserView : public BrowserWindow,
+   raw_ptr<views::WebView, AcrossTasksDanglingUntriaged> devtools_web_view_ =
+       nullptr;
+
++#if 0
+   // The view that overlays a watermark on the contents container.
+   raw_ptr<enterprise_watermark::WatermarkView> watermark_view_ = nullptr;
++#endif
+
+   // The view managing the devtools and contents positions.
+   // Handled by ContentsLayoutManager.
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
@@ -2216,10 +2216,10 @@ index 9f2fbc1e53937448aa27c1f5fe110eabc7edc0df..ea77c7598153bb8a9ba20c89a4ece2c1
  // bootstrap scripts, whose source are bundled into the binary as static data.
 diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
 new file mode 100755
-index 0000000000000000000000000000000000000000..e620a64ad1fa0ac7fc517a87ceaf019b1ad616c6
+index 0000000000000000000000000000000000000000..7848ddb1841b6d4f36e9376c73564eb4ff6d7c08
 --- /dev/null
 +++ b/tools/generate_gn_filenames_json.py
-@@ -0,0 +1,98 @@
+@@ -0,0 +1,90 @@
 +#!/usr/bin/env python3
 +import json
 +import os
@@ -2268,15 +2268,7 @@ index 0000000000000000000000000000000000000000..e620a64ad1fa0ac7fc517a87ceaf019b
 +
 +  def filter_v8_files(files):
 +    if any(f.startswith('deps/v8/') for f in files):
-+      new_files = []
-+      for f in files:
-+        if f.startswith('deps/v8/tools'):
-+          new_files.append(f)
-+        elif f.endswith('js'):
-+          new_files.append(f.replace('deps/v8/', '../../v8/', 1))
-+        else:
-+          new_files.append(f.replace('deps/v8/', '//v8/'))
-+      files = new_files
++      files = [f.replace('deps/v8/', '../../v8/', 1) if f.endswith('js') else f.replace('deps/v8/', '//v8/') for f in files]
 +
 +    if any(f == '<@(node_builtin_shareable_builtins)' for f in files):
 +      files.remove('<@(node_builtin_shareable_builtins)')