Remove unused argument in BeforeUnloadCompleted
This is a follow-up for:
https://chromium-review.googlesource.com/c/chromium/src/+/4160015
Bug: None
Change-Id: I2534e68e0c0c6c7ff63386f8e98c929b269e0134
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4173660
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1103755}
diff --git a/chrome/browser/devtools/devtools_browsertest.cc b/chrome/browser/devtools/devtools_browsertest.cc
index 94b469df..724f288 100644
--- a/chrome/browser/devtools/devtools_browsertest.cc
+++ b/chrome/browser/devtools/devtools_browsertest.cc
@@ -358,8 +358,7 @@
void Wait();
private:
// Invoked when the beforeunload handler fires.
- void BeforeUnloadFired(bool proceed,
- const base::TimeTicks& proceed_time) override;
+ void BeforeUnloadFired(bool proceed) override;
bool m_fired;
scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
@@ -379,9 +378,7 @@
message_loop_runner_->Run();
}
-void DevToolsWindowBeforeUnloadObserver::BeforeUnloadFired(
- bool proceed,
- const base::TimeTicks& proceed_time) {
+void DevToolsWindowBeforeUnloadObserver::BeforeUnloadFired(bool proceed) {
m_fired = true;
if (message_loop_runner_.get())
message_loop_runner_->Quit();
diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper.cc b/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
index 310570d..fbf262a1 100644
--- a/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
+++ b/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
@@ -46,8 +46,7 @@
HasBeforeUnloadHandlerCallback&& callback);
// WebContentsObserver:
- void BeforeUnloadFired(bool proceed,
- const base::TimeTicks& proceed_time) override;
+ void BeforeUnloadFired(bool proceed) override;
void BeforeUnloadDialogCancelled() override;
void WebContentsDestroyed() override;
@@ -86,9 +85,7 @@
DiscardBeforeUnloadHelper::~DiscardBeforeUnloadHelper() = default;
-void DiscardBeforeUnloadHelper::BeforeUnloadFired(
- bool proceed,
- const base::TimeTicks& proceed_time) {
+void DiscardBeforeUnloadHelper::BeforeUnloadFired(bool proceed) {
// |proceed = true| means no beforeunload handler and vice-versa.
Respond(!proceed /* has_beforeunload_handler */);
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 9860a76..58fc9ff 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5081,8 +5081,7 @@
frame->navigator().BeforeUnloadCompleted(frame, proceed,
before_unload_end_time);
} else {
- frame->render_manager()->BeforeUnloadCompleted(
- proceed, before_unload_end_time);
+ frame->render_manager()->BeforeUnloadCompleted(proceed);
}
},
// The overhead of the browser->renderer IPC may be non trivial. Account
@@ -8679,7 +8678,7 @@
FROM_HERE,
base::BindOnce(&RenderFrameHostManager::BeforeUnloadCompleted,
owner_->GetRenderFrameHostManager().GetWeakPtr(),
- /*proceed=*/true, base::TimeTicks::Now()));
+ /*proceed=*/true));
return;
}
TRACE_EVENT_NESTABLE_ASYNC_BEGIN1(
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index ee684222..872ca64 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -551,9 +551,7 @@
render_frame_host_->render_view_host()->GetWidget()->SetIsLoading(is_loading);
}
-void RenderFrameHostManager::BeforeUnloadCompleted(
- bool proceed,
- const base::TimeTicks& proceed_time) {
+void RenderFrameHostManager::BeforeUnloadCompleted(bool proceed) {
// If beforeunload was dispatched as part of preparing this frame for
// attaching an inner delegate, continue attaching now.
if (is_attaching_inner_delegate()) {
@@ -567,7 +565,7 @@
}
bool proceed_to_fire_unload = false;
- delegate_->BeforeUnloadFiredFromRenderManager(proceed, proceed_time,
+ delegate_->BeforeUnloadFiredFromRenderManager(proceed,
&proceed_to_fire_unload);
if (proceed_to_fire_unload) {
// If we're about to close the tab and there's a speculative RFH, cancel it.
diff --git a/content/browser/renderer_host/render_frame_host_manager.h b/content/browser/renderer_host/render_frame_host_manager.h
index 948c409..a8e4463 100644
--- a/content/browser/renderer_host/render_frame_host_manager.h
+++ b/content/browser/renderer_host/render_frame_host_manager.h
@@ -153,7 +153,6 @@
RenderViewHost* render_view_host) = 0;
virtual void BeforeUnloadFiredFromRenderManager(
bool proceed,
- const base::TimeTicks& proceed_time,
bool* proceed_to_fire_unload) = 0;
virtual void CancelModalDialogsForRenderManager() = 0;
virtual void NotifySwappedFromRenderManager(
@@ -310,15 +309,14 @@
void SetIsLoading(bool is_loading);
// Confirms whether we should close the page. |proceed| indicates whether the
- // user chose to proceed. |proceed_time| is the time when the request was
- // allowed to proceed. This is called in one of the two *distinct* scenarios
- // below:
+ // user chose to proceed. This is called in one of the two *distinct*
+ // scenarios below:
// 1- The tab/window is closed after allowing the appropriate renderer to
// show the beforeunload prompt.
// 2- The FrameTreeNode is being prepared for attaching an inner Delegate,
// in which case beforeunload is triggered in the current frame. This
// only happens for child frames.
- void BeforeUnloadCompleted(bool proceed, const base::TimeTicks& proceed_time);
+ void BeforeUnloadCompleted(bool proceed);
// Called when a renderer's frame navigates.
void DidNavigateFrame(RenderFrameHostImpl* render_frame_host,
diff --git a/content/browser/renderer_host/render_frame_host_manager_unittest.cc b/content/browser/renderer_host/render_frame_host_manager_unittest.cc
index b9b3356..9d54f59 100644
--- a/content/browser/renderer_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/renderer_host/render_frame_host_manager_unittest.cc
@@ -1643,7 +1643,7 @@
WidgetDestructionObserver observer(run_loop.QuitClosure());
host2->render_view_host()->GetWidget()->AddObserver(&observer);
- manager->BeforeUnloadCompleted(true, base::TimeTicks());
+ manager->BeforeUnloadCompleted(/*proceed=*/true);
run_loop.Run();
EXPECT_FALSE(GetPendingFrameHost(manager));
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c71f65f..5a0c8c5 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -8154,12 +8154,10 @@
void WebContentsImpl::BeforeUnloadFiredFromRenderManager(
bool proceed,
- const base::TimeTicks& proceed_time,
bool* proceed_to_fire_unload) {
OPTIONAL_TRACE_EVENT0("content",
"WebContentsImpl::BeforeUnloadFiredFromRenderManager");
- observers_.NotifyObservers(&WebContentsObserver::BeforeUnloadFired, proceed,
- proceed_time);
+ observers_.NotifyObservers(&WebContentsObserver::BeforeUnloadFired, proceed);
if (delegate_)
delegate_->BeforeUnloadFired(this, proceed, proceed_to_fire_unload);
// Note: |this| might be deleted at this point.
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 7591298..6259d6a 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -981,7 +981,6 @@
RenderViewHost* render_view_host) override;
void BeforeUnloadFiredFromRenderManager(
bool proceed,
- const base::TimeTicks& proceed_time,
bool* proceed_to_fire_unload) override;
void CancelModalDialogsForRenderManager() override;
void NotifySwappedFromRenderManager(RenderFrameHostImpl* old_frame,
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index d89d18e..f4c8ee3 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -696,9 +696,7 @@
// Invoked when the beforeunload handler fires. |proceed| is set to true if
// the beforeunload can safely proceed, otherwise it should be interrupted.
- // The time is from the renderer process.
- virtual void BeforeUnloadFired(bool proceed,
- const base::TimeTicks& proceed_time) {}
+ virtual void BeforeUnloadFired(bool proceed) {}
// Invoked when a user cancels a before unload dialog.
virtual void BeforeUnloadDialogCancelled() {}
diff --git a/content/public/test/mock_web_contents_observer.h b/content/public/test/mock_web_contents_observer.h
index 90ce0176..200b65f 100644
--- a/content/public/test/mock_web_contents_observer.h
+++ b/content/public/test/mock_web_contents_observer.h
@@ -257,10 +257,7 @@
(viz::VerticalScrollDirection scroll_direction),
(override));
MOCK_METHOD(void, BeforeFormRepostWarningShow, (), (override));
- MOCK_METHOD(void,
- BeforeUnloadFired,
- (bool proceed, const base::TimeTicks& proceed_time),
- (override));
+ MOCK_METHOD(void, BeforeUnloadFired, (bool proceed), (override));
MOCK_METHOD(void, BeforeUnloadDialogCancelled, (), (override));
MOCK_METHOD(void, AXTreeIDForMainFrameHasChanged, (), (override));
MOCK_METHOD(void,
