| Index: ui/android/window_android.cc
|
| diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc
|
| index 67c6cc1e4dad73072e6e88dc6f7bd723569301b0..7e40c8fb62e0ef658b1e094877498b12a4221c7b 100644
|
| --- a/ui/android/window_android.cc
|
| +++ b/ui/android/window_android.cc
|
| @@ -55,9 +55,8 @@ void WindowAndroid::DestroyForTesting() {
|
| }
|
|
|
| void WindowAndroid::OnCompositingDidCommit() {
|
| - FOR_EACH_OBSERVER(WindowAndroidObserver,
|
| - observer_list_,
|
| - OnCompositingDidCommit());
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnCompositingDidCommit();
|
| }
|
|
|
| void WindowAndroid::AddObserver(WindowAndroidObserver* observer) {
|
| @@ -74,16 +73,14 @@ void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) {
|
| DetachCompositor();
|
|
|
| compositor_ = compositor;
|
| - FOR_EACH_OBSERVER(WindowAndroidObserver,
|
| - observer_list_,
|
| - OnAttachCompositor());
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnAttachCompositor();
|
| }
|
|
|
| void WindowAndroid::DetachCompositor() {
|
| compositor_ = NULL;
|
| - FOR_EACH_OBSERVER(WindowAndroidObserver,
|
| - observer_list_,
|
| - OnDetachCompositor());
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnDetachCompositor();
|
| observer_list_.Clear();
|
| }
|
|
|
| @@ -98,8 +95,8 @@ void WindowAndroid::SetNeedsAnimate() {
|
| }
|
|
|
| void WindowAndroid::Animate(base::TimeTicks begin_frame_time) {
|
| - FOR_EACH_OBSERVER(
|
| - WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time));
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnAnimate(begin_frame_time);
|
| }
|
|
|
| void WindowAndroid::OnVSync(JNIEnv* env,
|
| @@ -109,10 +106,8 @@ void WindowAndroid::OnVSync(JNIEnv* env,
|
| base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros));
|
| base::TimeDelta vsync_period(
|
| base::TimeDelta::FromMicroseconds(period_micros));
|
| - FOR_EACH_OBSERVER(
|
| - WindowAndroidObserver,
|
| - observer_list_,
|
| - OnVSync(frame_time, vsync_period));
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnVSync(frame_time, vsync_period);
|
| if (compositor_)
|
| compositor_->OnVSync(frame_time, vsync_period);
|
| }
|
| @@ -120,18 +115,20 @@ void WindowAndroid::OnVSync(JNIEnv* env,
|
| void WindowAndroid::OnVisibilityChanged(JNIEnv* env,
|
| const JavaParamRef<jobject>& obj,
|
| bool visible) {
|
| - FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_,
|
| - OnRootWindowVisibilityChanged(visible));
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnRootWindowVisibilityChanged(visible);
|
| }
|
|
|
| void WindowAndroid::OnActivityStopped(JNIEnv* env,
|
| const JavaParamRef<jobject>& obj) {
|
| - FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityStopped());
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnActivityStopped();
|
| }
|
|
|
| void WindowAndroid::OnActivityStarted(JNIEnv* env,
|
| const JavaParamRef<jobject>& obj) {
|
| - FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityStarted());
|
| + for (WindowAndroidObserver& observer : observer_list_)
|
| + observer.OnActivityStarted();
|
| }
|
|
|
| bool WindowAndroid::HasPermission(const std::string& permission) {
|
|
|