75110e9734d01a73151a0ecdc301dc07e92d2b1c - chromium/src

[jia...@google.com]

commit 75110e9734d01a73151a0ecdc301dc07e92d2b1c
Author: Jian Li <jia...@google.com>
AuthorDate: Thu Apr 01 05:47:14 2021
Commit: Chromium LUCI CQ <chromiu...@luci-project-accounts.iam.gserviceaccount.com>
CommitDate: Thu Apr 01 05:47:14 2021

Add new method getActivity to SurfaceScopeDependencyProvider

Bug: 1185304
Change-Id: If9080023a490d3e93f71afe993b716e07063fea6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2792734
Reviewed-by: Justin DeWitt <dew...@chromium.org>
Commit-Queue: Jian Li <jia...@chromium.org>
Cr-Commit-Position: refs/heads/master@{#868421}

diff --git a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java
index 09b304f..737ccf7 100644
--- a/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java
+++ b/chrome/browser/xsurface/android/java/src/org/chromium/chrome/browser/xsurface/SurfaceScopeDependencyProvider.java
@@ -4,6 +4,7 @@

package org.chromium.chrome.browser.xsurface;

+import android.app.Activity;
import android.content.Context;

import androidx.annotation.Nullable;
@@ -14,6 +15,12 @@
* Should only be called on the UI thread.
*/
public interface SurfaceScopeDependencyProvider {
+ /** Returns the activity. */
+ @Nullable
+ default Activity getActivity() {
+ return null;
+ }
+
/** Returns the application context. */
@Nullable
default Context getApplicationContext() {