| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 void OnActivityPaused(JNIEnv* env, jobject obj); | 63 void OnActivityPaused(JNIEnv* env, jobject obj); |
| 64 void OnActivityResumed(JNIEnv* env, jobject obj); | 64 void OnActivityResumed(JNIEnv* env, jobject obj); |
| 65 | 65 |
| 66 private: | 66 private: |
| 67 ~WindowAndroid(); | 67 ~WindowAndroid(); |
| 68 | 68 |
| 69 base::android::ScopedJavaGlobalRef<jobject> java_window_; | 69 base::android::ScopedJavaGlobalRef<jobject> java_window_; |
| 70 gfx::Vector2dF content_offset_; | 70 gfx::Vector2dF content_offset_; |
| 71 WindowAndroidCompositor* compositor_; | 71 WindowAndroidCompositor* compositor_; |
| 72 | 72 |
| 73 ObserverList<WindowAndroidObserver> observer_list_; | 73 base::ObserverList<WindowAndroidObserver> observer_list_; |
| 74 | 74 |
| 75 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); | 75 DISALLOW_COPY_AND_ASSIGN(WindowAndroid); |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 } // namespace ui | 78 } // namespace ui |
| 79 | 79 |
| 80 #endif // UI_ANDROID_WINDOW_ANDROID_H_ | 80 #endif // UI_ANDROID_WINDOW_ANDROID_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1162943002:
Replace more ObserverList with base::ObserverList. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@observer