| Index: chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
| index 93b4a79903b0ca39ac873c8d15723355578fec5e..36745ee0102b19d696ec67b5b002b30c616316b1 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/webshare/ShareServiceImpl.java
|
| @@ -10,7 +10,6 @@ import android.support.annotation.Nullable;
|
|
|
| import org.chromium.base.metrics.RecordHistogram;
|
| import org.chromium.chrome.browser.share.ShareHelper;
|
| -import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content_public.browser.WebContents;
|
| import org.chromium.mojo.system.MojoException;
|
| import org.chromium.ui.base.WindowAndroid;
|
| @@ -82,10 +81,7 @@ public class ShareServiceImpl implements ShareService {
|
| private static Activity activityFromWebContents(@Nullable WebContents webContents) {
|
| if (webContents == null) return null;
|
|
|
| - ContentViewCore contentViewCore = ContentViewCore.fromWebContents(webContents);
|
| - if (contentViewCore == null) return null;
|
| -
|
| - WindowAndroid window = contentViewCore.getWindowAndroid();
|
| + WindowAndroid window = webContents.getTopLevelNativeWindow();
|
| if (window == null) return null;
|
|
|
| return window.getActivity().get();
|
|
|