Make WindowAndroid a ViewAndroid

content/browser/android/content_view_core_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 42 matching lines @@
       JNIEnv* env,
       jobject obj,
       WebContents* web_contents,
       const base::android::JavaRef<jobject>& view_android_delegate,
       ui::WindowAndroid* window_android,
       jobject java_bridge_retained_object_set);
 
   // ContentViewCore implementation.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   WebContents* GetWebContents() const override;
-  ui::WindowAndroid* GetWindowAndroid() const override;
+  ui::WindowAndroid* GetWindowAndroid() override;
   const base::android::JavaRef<jobject>& GetViewAndroidDelegate()
       const override;
   cc::Layer* GetLayer() const override;
   bool ShowPastePopup(int x, int y) override;
   float GetDpiScale() const override;
   void PauseOrResumeGeolocation(bool should_pause) override;
   void RequestTextSurroundingSelection(
       int max_length,
       const base::Callback<void(const base::string16& content,
                                 int start_offset,
@@ skipping 404 matching lines @@
   scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_