diff --git a/build/patches/Enable-extension-in-incognito.patch b/build/patches/Enable-extension-in-incognito.patch index d3375cf8..7a711f71 100644 --- a/build/patches/Enable-extension-in-incognito.patch +++ b/build/patches/Enable-extension-in-incognito.patch @@ -25,7 +25,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ui/extensions/ExtensionActionsBridge.java | 65 +++++++++- .../ui/extensions/ExtensionsMenuBridge.java | 101 ++++++++++++--- .../extensions/ExtensionsToolbarBridge.java | 121 +++++++++++++----- - .../android/tab_model/tab_model_jni_bridge.cc | 4 + .../ExtensionActionListCoordinator.java | 15 ++- .../ExtensionActionListMediator.java | 30 ++--- .../ExtensionToolbarCoordinator.java | 3 + @@ -37,7 +36,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ChromeAndroidTaskFeature.java | 2 +- components/tabs/impl/tab_collection.cc | 16 +++ components/tabs/impl/tab_strip_collection.cc | 4 +- - 31 files changed, 419 insertions(+), 124 deletions(-) + 30 files changed, 415 insertions(+), 124 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java @@ -1042,20 +1041,6 @@ diff --git a/chrome/browser/ui/android/extensions/java/src/org/chromium/chrome/b observer.onActiveWebContentsChanged(); } } -diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc ---- a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc -+++ b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc -@@ -126,6 +126,10 @@ void TabModelJniBridge::AssociateWithBrowserWindow( - if (!TabModel::EnableBrowserWindowInterfaceMobile()) { - return; - } -+ if (native_android_browser_window == 0) { -+ scoped_unowned_user_data_.reset(); -+ return; -+ } - BrowserWindowInterface* android_browser_window = - reinterpret_cast(native_android_browser_window); - CHECK(android_browser_window != nullptr); diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/extensions/ExtensionActionListCoordinator.java