From 776466f9cfde2dcdd4e08b04f48a742dc42bbbb3 Mon Sep 17 00:00:00 2001
From: Max Karolinskiy <max@brave.com>
Date: Mon, 13 Jan 2020 16:00:21 -0500
Subject: [PATCH] [Android] AppMenuPropertiesDelegateImpl.prepareMenu signature
 change.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/eb7da349e164fb82fe1f68f9cb2591852e977480

commit eb7da349e164fb82fe1f68f9cb2591852e977480
Author: Theresa Wellington <twellington@chromium.org>
Date:   Wed Oct 30 18:33:45 2019 +0000

    Introduce appmenu.CustomViewBinder interface for update menu item

    Introduce a new CustomViewBinder interface that allows
    AppMenuPropertiesDelegates to handle binding for custom menu items.

    This interface is used to provide a custom binder for the update menu
    item, which relies on UpdateMenuItemHelper methods/classes that will not
    be moved to the appmenu/ package when its modularized.

    Bug: 966644
---
 .../browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java b/android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java
index 007d6002bd9..5d86ea8b93e 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java
@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificat
 import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.toolbar.ToolbarManager;
+import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
 
 public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegateImpl {
     private Menu mMenu;
@@ -39,8 +40,8 @@ public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegat
     }
 
     @Override
-    public void prepareMenu(Menu menu) {
-        super.prepareMenu(menu);
+    public void prepareMenu(Menu menu, AppMenuHandler handler) {
+        super.prepareMenu(menu, handler);
 
         mMenu = menu;