Reland Pull the Activity context from WindowAndroid if possible

content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Point;
 import android.provider.Settings;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * This class implements accelerated fullscreen video playback using surface view.
  */
 @JNINamespace("content")
 public class ContentVideoView extends FrameLayout
         implements SurfaceHolder.Callback {
 
     private static final String TAG = "cr.ContentVideoView";
 
@@ skipping 181 matching lines @@
             return;
         }
 
         // Ignore some invalid error codes.
         if (errorType == MEDIA_ERROR_INVALID_CODE) {
             return;
         }
 
         mCurrentState = STATE_ERROR;
 
-        if (ContentViewCore.activityFromContext(getContext()) == null) {
+        if (WindowAndroid.activityFromContext(getContext()) == null) {
             Log.w(TAG, "Unable to show alert dialog because it requires an activity context");
             return;
         }
 
         /* Pop up an error dialog so the user knows that
          * something bad has happened. Only try and pop up the dialog
          * if we're attached to a window. When we're going away and no
          * longer have a window, don't bother showing the user an error.
          *
          * TODO(qinmin): We need to review whether this Dialog is OK with
@@ skipping 194 matching lines @@
     private native void nativeRequestMediaMetadata(long nativeContentVideoView);
     private native boolean nativeIsPlaying(long nativeContentVideoView);
     private native void nativeSetSurface(long nativeContentVideoView, Surface surface);
     private native void nativeRecordFullscreenPlayback(
             long nativeContentVideoView, boolean isVideoPortrait, boolean isOrientationPortrait);
     private native void nativeRecordExitFullscreenPlayback(
             long nativeContentVideoView, boolean isOrientationPortrait,
             long playbackDurationBeforeOrientationChange,
             long playbackDurationAfterOrientationChange);
 }