| Index: ui/android/window_android.h
|
| diff --git a/ui/android/window_android.h b/ui/android/window_android.h
|
| index 54b57fc89fd32abfaa12a482e28615ab6e8635de..ddc173f2456f0014ee41910065c1645a0ee22ebd 100644
|
| --- a/ui/android/window_android.h
|
| +++ b/ui/android/window_android.h
|
| @@ -16,7 +16,6 @@
|
| #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 cc {
|
| @@ -33,8 +32,7 @@ class WindowAndroidCompositor;
|
| class WindowAndroidObserver;
|
|
|
| // Android implementation of the activity window.
|
| -// WindowAndroid is also the root of a ViewAndroid tree.
|
| -class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
|
| +class UI_ANDROID_EXPORT WindowAndroid {
|
| public:
|
| WindowAndroid(JNIEnv* env, jobject obj, int display_id);
|
|
|
| @@ -79,8 +77,6 @@ class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
|
| const base::android::JavaParamRef<jobject>& obj);
|
| void OnActivityStarted(JNIEnv* env,
|
| const base::android::JavaParamRef<jobject>& obj);
|
| - base::android::ScopedJavaLocalRef<jobject> GetViewRootForJava(JNIEnv* env,
|
| - const base::android::JavaParamRef<jobject>& obj);
|
|
|
| // Return whether the specified Android permission is granted.
|
| bool HasPermission(const std::string& permission);
|
| @@ -95,14 +91,11 @@ class UI_ANDROID_EXPORT WindowAndroid : public ViewAndroid {
|
| friend class DisplayAndroidManager;
|
| friend class WindowBeginFrameSource;
|
|
|
| - ~WindowAndroid() override;
|
| + ~WindowAndroid();
|
|
|
| void SetNeedsBeginFrames(bool needs_begin_frames);
|
| void RequestVSyncUpdate();
|
|
|
| - // ViewAndroid overrides.
|
| - WindowAndroid* GetWindowAndroid() const override;
|
| -
|
| // The ID of the display that this window belongs to.
|
| int display_id() const { return display_id_; }
|
|
|
|
|