Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: ui/android/window_android.cc

Issue 2422073002: Reduce FOR_EACH_OBSERVER usage in ui/ (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/android/window_android.cc
diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc
index 67c6cc1e4dad73072e6e88dc6f7bd723569301b0..d12cf8cacf88de21d254c7912568ad997883cb8d 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 (auto& 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 (auto& observer : observer_list_)
+ observer.OnAttachCompositor();
}
void WindowAndroid::DetachCompositor() {
compositor_ = NULL;
- FOR_EACH_OBSERVER(WindowAndroidObserver,
- observer_list_,
- OnDetachCompositor());
+ for (auto& 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 (auto& 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 (auto& 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 (auto& observer : observer_list_)
+ observer.OnRootWindowVisibilityChanged(visible);
}
void WindowAndroid::OnActivityStopped(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
- FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityStopped());
+ for (auto& observer : observer_list_)
+ observer.OnActivityStopped();
}
void WindowAndroid::OnActivityStarted(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
- FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityStarted());
+ for (auto& observer : observer_list_)
+ observer.OnActivityStarted();
}
bool WindowAndroid::HasPermission(const std::string& permission) {

Powered by Google App Engine
This is Rietveld 408576698