Conflict-resolved patches from Chromium 146.0.7680.32 to Chromium 146.0.7680.65.

2026-03-06 18:32:08 -05:00
parent c71a5d7cdf
commit ddebfdc197
1 changed files with 3 additions and 3 deletions
@@ -1,9 +1,9 @@
 diff --git a/chrome/browser/ui/omnibox/omnibox_popup_view.h b/chrome/browser/ui/omnibox/omnibox_popup_view.h
-index 07c9a2bc04846377a16c7a64e1cc08cbc698ced2..125da8f629b3290d9c6731286d9acab6f6b89395 100644
+index 5b3851817155858fdec46769674e2a70c33c7c13..e60d128d4db2301a4b2bcbcb799005d01c36b63f 100644
 --- a/chrome/browser/ui/omnibox/omnibox_popup_view.h
 +++ b/chrome/browser/ui/omnibox/omnibox_popup_view.h
-@@ -57,6 +57,7 @@ class OmniboxPopupView {
-       size_t line) const;
+@@ -69,6 +69,7 @@ class OmniboxPopupView {
+   virtual bool IsSelectionPopupControlled() const = 0;
 
  protected:
 +  BRAVE_OMNIBOX_POPUP_VIEW_FRIEND