Mark the WebContents::ForEachFrame() callback as repeating.
Also fix nits and lint errors along the way.
BUG=714018
Change-Id: Ib43287e18b8e7f766ddc6e9b0b813035a17de515
Reviewed-on: https://chromium-review.googlesource.com/860173
Reviewed-by: Alex Moshchuk <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Reviewed-by: Taiju Tsuiki <[email protected]>
Commit-Queue: Lei Zhang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#529028}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 341b7efc3..4277b13 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -161,13 +161,9 @@
#include "base/mac/foundation_util.h"
#endif
-#if defined(USE_AURA)
-#include "content/public/common/service_manager_connection.h"
-#endif
-
#if BUILDFLAG(ENABLE_PLUGINS)
#include "content/browser/media/session/pepper_playback_observer.h"
-#endif // ENABLE_PLUGINS
+#endif
namespace content {
namespace {
@@ -177,7 +173,7 @@
#if defined(OS_ANDROID)
const void* const kWebContentsAndroidKey = &kWebContentsAndroidKey;
-#endif // OS_ANDROID
+#endif
base::LazyInstance<std::vector<WebContentsImpl::CreatedCallback>>::
DestructorAtExit g_created_callbacks = LAZY_INSTANCE_INITIALIZER;
@@ -974,7 +970,7 @@
}
void WebContentsImpl::ForEachFrame(
- const base::Callback<void(RenderFrameHost*)>& on_frame) {
+ const base::RepeatingCallback<void(RenderFrameHost*)>& on_frame) {
for (FrameTreeNode* node : frame_tree_.Nodes()) {
on_frame.Run(node->current_frame_host());
}
