Commit 23f02cf0 authored by Brandon Wylie's avatar Brandon Wylie Committed by Chromium LUCI CQ

Remove ChromeActivity reference in ToolbarButtonInProductHelpController

Bug: 1123209
Change-Id: I5a379fb181f277cd3cd67c193912e29a0b949836
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566738
Commit-Queue: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Reviewed-by: default avatarPatrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837105}
parent b002f221
...@@ -339,9 +339,6 @@ specific_include_rules = { ...@@ -339,9 +339,6 @@ specific_include_rules = {
"ReturnToChromeExperimentsUtil\.java": [ "ReturnToChromeExperimentsUtil\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
"ToolbarButtonInProductHelpController\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
],
"CustomTabToolbar\.java": [ "CustomTabToolbar\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
......
...@@ -330,8 +330,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator { ...@@ -330,8 +330,10 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
if (mActivity == null) return; if (mActivity == null) return;
mToolbarButtonIphTabSupplier = new ObservableSupplierImpl<>(); mToolbarButtonIphTabSupplier = new ObservableSupplierImpl<>();
mToolbarButtonInProductHelpController = mToolbarButtonInProductHelpController =
new ToolbarButtonInProductHelpController(mActivity, mAppMenuCoordinator, new ToolbarButtonInProductHelpController(mActivity, mActivity.getWindowAndroid(),
mActivity.getLifecycleDispatcher(), mToolbarButtonIphTabSupplier); mAppMenuCoordinator, mActivity.getLifecycleDispatcher(),
mToolbarButtonIphTabSupplier, mActivity::isInOverviewMode,
mToolbarManager.getMenuButtonView(), mToolbarManager.getSecurityIconView());
ActivityTabProvider activityTabProvider = mActivity.getActivityTabProvider(); ActivityTabProvider activityTabProvider = mActivity.getActivityTabProvider();
mToolbarButtonIphTabObserver = new ActivityTabTabObserver(activityTabProvider) { mToolbarButtonIphTabObserver = new ActivityTabTabObserver(activityTabProvider) {
@Override @Override
......
...@@ -2,8 +2,10 @@ noparent = True ...@@ -2,8 +2,10 @@ noparent = True
include_rules = [ include_rules = [
"-chrome/android/java/src/org/chromium/chrome/browser", "-chrome/android/java/src/org/chromium/chrome/browser",
"+base/android/java/src/org/chromium/base/supplier",
"+chrome/android/java/src/org/chromium/chrome/browser/toolbar", "+chrome/android/java/src/org/chromium/chrome/browser/toolbar",
"+chrome/android/java/src/org/chromium/chrome/browser/omnibox", "+chrome/android/java/src/org/chromium/chrome/browser/omnibox",
"+ui/android/java/src/org/chromium/ui/base",
] ]
specific_include_rules = { specific_include_rules = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment