Make WindowAndroid a ViewAndroid

ui/android/window_android.h

Index: ui/android/window_android.h
diff --git a/ui/android/window_android.h b/ui/android/window_android.h
index 258afcd355fbf43d332426a29d5439b5d2ea700b..76ffbae8c7124e0c6bd3c233a22299949a7881ab 100644
--- a/ui/android/window_android.h
+++ b/ui/android/window_android.h
@@ -15,6 +15,7 @@
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/android/ui_android_export.h"
+#include "ui/android/view_android.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace ui {
@@ -23,7 +24,8 @@ class WindowAndroidCompositor;
 class WindowAndroidObserver;
 
 // Android implementation of the activity window.
-class UI_ANDROID_EXPORT WindowAndroid {
+// WindowAndroid is also the root of a ViewAndroid tree.
+class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
  public:
   WindowAndroid(JNIEnv* env, jobject obj);
 
@@ -79,6 +81,9 @@ class UI_ANDROID_EXPORT WindowAndroid {
  private:
   ~WindowAndroid();
 
+  // ViewAndroid overrides.
+  WindowAndroid* GetWindowAndroid() override;
+
   base::android::ScopedJavaGlobalRef<jobject> java_window_;
   gfx::Vector2dF content_offset_;
   WindowAndroidCompositor* compositor_;