39
39
import org .chromium .chrome .browser .night_mode .GlobalNightModeStateProviderHolder ;
40
40
import org .chromium .chrome .browser .tab .Tab ;
41
41
import org .chromium .chrome .browser .tab .TabLaunchType ;
42
+ import org .chromium .chrome .browser .tabmodel .TabModelSelector ;
42
43
import org .chromium .chrome .browser .tasks .tab_management .BraveTabUiFeatureUtilities ;
43
44
import org .chromium .chrome .browser .toolbar .LocationBarModel ;
44
45
import org .chromium .components .bookmarks .BookmarkId ;
@@ -194,7 +195,13 @@ public static void openNewTab() {
194
195
195
196
private static void openNewTab (BraveActivity braveActivity , boolean isIncognito ) {
196
197
if (braveActivity == null ) return ;
197
- braveActivity .getTabModelSelector ().getModel (isIncognito ).commitAllTabClosures ();
198
+
199
+ ObservableSupplier <TabModelSelector > supplier = braveActivity .getTabModelSelectorSupplier ();
200
+ TabModelSelector selector = supplier .get ();
201
+ if (selector == null ) {
202
+ return ;
203
+ }
204
+ selector .getModel (isIncognito ).commitAllTabClosures ();
198
205
braveActivity .getTabCreator (isIncognito ).launchNtp ();
199
206
}
200
207
@@ -210,13 +217,19 @@ public static void openUrlInNewTab(boolean isIncognito, String url) {
210
217
public static void openUrlInNewTabInBackground (boolean isIncognito , String url ) {
211
218
try {
212
219
BraveActivity braveActivity = BraveActivity .getBraveActivity ();
213
- if (braveActivity .getTabModelSelector () != null
214
- && braveActivity .getActivityTab () != null ) {
215
- braveActivity .getTabModelSelector ().openNewTab (new LoadUrlParams (url ),
220
+
221
+ ObservableSupplier <TabModelSelector > supplier =
222
+ braveActivity .getTabModelSelectorSupplier ();
223
+ TabModelSelector selector = supplier .get ();
224
+
225
+ if (selector != null && braveActivity .getActivityTab () != null ) {
226
+ selector .openNewTab (
227
+ new LoadUrlParams (url ),
216
228
BraveTabUiFeatureUtilities .isBraveTabGroupsEnabled ()
217
229
? TabLaunchType .FROM_LONGPRESS_BACKGROUND_IN_GROUP
218
230
: TabLaunchType .FROM_LONGPRESS_BACKGROUND ,
219
- braveActivity .getActivityTab (), isIncognito );
231
+ braveActivity .getActivityTab (),
232
+ isIncognito );
220
233
}
221
234
} catch (BraveActivity .BraveActivityNotFoundException e ) {
222
235
Log .e (TAG , "openUrlInNewTabInBackground " + e );
0 commit comments