| Index: ui/android/window_android.h
|
| diff --git a/ui/android/window_android.h b/ui/android/window_android.h
|
| index 4bbc897dbf36bf541f8a40e5556fba888f7857f2..05279ced4c92a2a9e8827b15c67e0c94187a9e11 100644
|
| --- a/ui/android/window_android.h
|
| +++ b/ui/android/window_android.h
|
| @@ -6,7 +6,6 @@
|
| #define UI_ANDROID_WINDOW_ANDROID_H_
|
|
|
| #include <jni.h>
|
| -#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -19,13 +18,9 @@
|
| #include "ui/android/view_android.h"
|
| #include "ui/gfx/geometry/vector2d_f.h"
|
|
|
| -namespace cc {
|
| -class BeginFrameSource;
|
| -} // namespace cc
|
| -
|
| namespace display {
|
| class DisplayAndroidManager;
|
| -} // namespace display
|
| +}
|
|
|
| namespace ui {
|
|
|
| @@ -64,8 +59,8 @@
|
| void RemoveObserver(WindowAndroidObserver* observer);
|
|
|
| WindowAndroidCompositor* GetCompositor() { return compositor_; }
|
| - cc::BeginFrameSource* GetBeginFrameSource();
|
|
|
| + void RequestVSyncUpdate();
|
| void SetNeedsAnimate();
|
| void Animate(base::TimeTicks begin_frame_time);
|
| void OnVSync(JNIEnv* env,
|
| @@ -89,14 +84,9 @@
|
| void DestroyForTesting();
|
|
|
| private:
|
| - class WindowBeginFrameSource;
|
| friend class DisplayAndroidManager;
|
| - friend class WindowBeginFrameSource;
|
|
|
| ~WindowAndroid() override;
|
| -
|
| - void SetNeedsBeginFrames(bool needs_begin_frames);
|
| - void RequestVSyncUpdate();
|
|
|
| // ViewAndroid overrides.
|
| WindowAndroid* GetWindowAndroid() const override;
|
| @@ -111,9 +101,6 @@
|
|
|
| base::ObserverList<WindowAndroidObserver> observer_list_;
|
|
|
| - std::unique_ptr<WindowBeginFrameSource> begin_frame_source_;
|
| - bool needs_begin_frames_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(WindowAndroid);
|
| };
|
|
|
|
|