| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef UI_ANDROID_WINDOW_ANDROID_H_ | 5 #ifndef UI_ANDROID_WINDOW_ANDROID_H_ |
| 6 #define UI_ANDROID_WINDOW_ANDROID_H_ | 6 #define UI_ANDROID_WINDOW_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 void SetNeedsAnimate(); | 56 void SetNeedsAnimate(); |
| 57 void OnVSync(JNIEnv* env, | 57 void OnVSync(JNIEnv* env, |
| 58 jobject obj, | 58 jobject obj, |
| 59 jlong time_micros, | 59 jlong time_micros, |
| 60 jlong period_micros); | 60 jlong period_micros); |
| 61 void Animate(base::TimeTicks begin_frame_time); | 61 void Animate(base::TimeTicks begin_frame_time); |
| 62 | 62 |
| 63 private: | 63 private: |
| 64 ~WindowAndroid(); | 64 ~WindowAndroid(); |
| 65 | 65 |
| 66 JavaObjectWeakGlobalRef weak_java_window_; | 66 base::android::ScopedJavaGlobalRef<jobject> java_window_; |
| 67 gfx::Vector2dF content_offset_; | 67 gfx::Vector2dF content_offset_; |
| 68 WindowAndroidCompositor* compositor_; | 68 WindowAndroidCompositor* compositor_; |
| 69 | 69 |
| 70 ObserverList<WindowAndroidObserver> observer_list_; | 70 ObserverList<WindowAndroidObserver> observer_list_; |
| 71 | 71 |
| 72 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); | 72 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 } // namespace ui | 75 } // namespace ui |
| 76 | 76 |
| 77 #endif // UI_ANDROID_WINDOW_ANDROID_H_ | 77 #endif // UI_ANDROID_WINDOW_ANDROID_H_ |
| OLD | NEW |