From f5483833a43250070a0690ff754f3ff686d19779 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Mon, 27 Apr 2026 10:01:18 -0400 Subject: [PATCH] [cr149][Android] Add Glic Button to MTB Chromium changes: https://chromium.googlesource.com/chromium/src/+/481c8c624365ce1b5d86a8c2ad0082611239fb81 commit 481c8c624365ce1b5d86a8c2ad0082611239fb81 Author: Alexis Wu Date: Thu Mar 26 10:48:10 2026 -0700 [GlicSettings] Add Glic Button to MTB This CL adds the glic button to the selection menu for MTB. Relevant unit tests are also added. screenshot: https://screenshot.googleplex.com/7VMLfF5uqAenMNz Fixed: b:494269230 Change-Id: I507c3b2db9437764d5de724ffce6253c1ccd491e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7695275 Reviewed-by: Michael Wu Commit-Queue: Alexis Wu Reviewed-by: Matthew Jones Cr-Commit-Position: refs/heads/main@{#1605654} --- .../settings/BraveAdaptiveToolbarSettingsFragmentTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/android/junit/src/org/chromium/chrome/browser/toolbar/adaptive/settings/BraveAdaptiveToolbarSettingsFragmentTest.java b/android/junit/src/org/chromium/chrome/browser/toolbar/adaptive/settings/BraveAdaptiveToolbarSettingsFragmentTest.java index 75bc1e6ca24..20b3442db4b 100644 --- a/android/junit/src/org/chromium/chrome/browser/toolbar/adaptive/settings/BraveAdaptiveToolbarSettingsFragmentTest.java +++ b/android/junit/src/org/chromium/chrome/browser/toolbar/adaptive/settings/BraveAdaptiveToolbarSettingsFragmentTest.java @@ -34,6 +34,8 @@ import org.robolectric.annotation.Config; import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.Features.EnableFeatures; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.glic.GlicEnabling; +import org.chromium.chrome.browser.glic.GlicEnablingJni; import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionUtil; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; import org.chromium.chrome.browser.profiles.Profile; @@ -63,6 +65,7 @@ public class BraveAdaptiveToolbarSettingsFragmentTest { @Mock private UserPrefsJni mUserPrefsNatives; @Mock private PrefService mPrefService; @Mock private TemplateUrlService mTemplateUrlService; + @Mock private GlicEnabling.Natives mGlicEnablingNatives; private ChromeSwitchPreference mSwitchPreference; private RadioButtonGroupAdaptiveToolbarPreference mRadioPreference; @@ -72,6 +75,8 @@ public class BraveAdaptiveToolbarSettingsFragmentTest { UserPrefsJni.setInstanceForTesting(mUserPrefsNatives); doReturn(mPrefService).when(mUserPrefsNatives).get(any()); + GlicEnablingJni.setInstanceForTesting(mGlicEnablingNatives); + ChromeSharedPreferences.getInstance().removeKey(ADAPTIVE_TOOLBAR_CUSTOMIZATION_ENABLED); ChromeSharedPreferences.getInstance().removeKey(ADAPTIVE_TOOLBAR_CUSTOMIZATION_SETTINGS); AdaptiveToolbarStatePredictor.setSegmentationResultsForTesting(