Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index fcae5eb409d595ed0d620a49c3a4263de80bd0a5..a57c90c933ce616eca655eb4360bdd484debc0c1 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -398,16 +398,6 @@ WebContentsImpl::~WebContentsImpl() { |
} |
#endif |
- // OnCloseStarted isn't called in unit tests. |
- if (!close_start_time_.is_null()) { |
- base::TimeTicks now = base::TimeTicks::Now(); |
- base::TimeTicks unload_start_time = close_start_time_; |
- if (!before_unload_end_time_.is_null()) |
- unload_start_time = before_unload_end_time_; |
- UMA_HISTOGRAM_TIMES("Tab.Close", now - close_start_time_); |
- UMA_HISTOGRAM_TIMES("Tab.Close.UnloadTime", now - unload_start_time); |
- } |
- |
FOR_EACH_OBSERVER(WebContentsObserver, |
observers_, |
WebContentsImplDestroyed()); |
@@ -1948,23 +1938,10 @@ RendererPreferences* WebContentsImpl::GetMutableRendererPrefs() { |
return &renderer_preferences_; |
} |
-void WebContentsImpl::SetNewTabStartTime(const base::TimeTicks& time) { |
- new_tab_start_time_ = time; |
-} |
- |
-base::TimeTicks WebContentsImpl::GetNewTabStartTime() const { |
- return new_tab_start_time_; |
-} |
- |
void WebContentsImpl::Close() { |
Close(GetRenderViewHost()); |
} |
-void WebContentsImpl::OnCloseStarted() { |
- if (close_start_time_.is_null()) |
- close_start_time_ = base::TimeTicks::Now(); |
-} |
- |
void WebContentsImpl::DragSourceEndedAt(int client_x, int client_y, |
int screen_x, int screen_y, WebKit::WebDragOperation operation) { |
if (browser_plugin_embedder_.get()) |
@@ -3489,7 +3466,8 @@ void WebContentsImpl::WorkerCrashed() { |
void WebContentsImpl::BeforeUnloadFiredFromRenderManager( |
bool proceed, const base::TimeTicks& proceed_time, |
bool* proceed_to_fire_unload) { |
- before_unload_end_time_ = proceed_time; |
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
+ BeforeUnloadFired(proceed_time)); |
if (delegate_) |
delegate_->BeforeUnloadFired(this, proceed, proceed_to_fire_unload); |
} |
@@ -3632,8 +3610,8 @@ void WebContentsImpl::OnDialogClosed(RenderViewHost* rvh, |
DidStopLoading(rvh); |
controller_.DiscardNonCommittedEntries(); |
- close_start_time_ = base::TimeTicks(); |
- before_unload_end_time_ = base::TimeTicks(); |
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
+ BeforeUnloadDialogCancelled()); |
} |
is_showing_before_unload_dialog_ = false; |
static_cast<RenderViewHostImpl*>( |