Index: chrome/renderer/searchbox/searchbox.cc |
diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc |
index 58e76dfb6ffbcc64b89eecf0ea58d6036e4a3f56..f7bdb675852321a87870338b15c14ac81b05273b 100644 |
--- a/chrome/renderer/searchbox/searchbox.cc |
+++ b/chrome/renderer/searchbox/searchbox.cc |
@@ -160,13 +160,18 @@ SearchBox::~SearchBox() { |
} |
void SearchBox::LogEvent(NTPLoggingEventType event) { |
- // navigation_start in ms. |
- uint64 start = 1000 * (render_view()->GetMainRenderFrame()->GetWebFrame()-> |
- performance().navigationStart()); |
- uint64 now = |
- (base::TimeTicks::Now() - base::TimeTicks::UnixEpoch()).InMilliseconds(); |
- DCHECK(now >= start); |
- base::TimeDelta delta = base::TimeDelta::FromMilliseconds(now - start); |
+ base::TimeDelta delta; |
Charlie Reis
2015/03/20 21:37:52
nit: Put below the comment.
alexmos
2015/03/20 21:50:57
Done.
|
+ // The main frame for the current RenderView may be out-of-process, in which |
+ // case it won't have navigationStart(). Use a delta of 0 in this case. |
Charlie Reis
2015/03/20 21:37:52
s/navigationStart()/performance()/
Also, "Use the
alexmos
2015/03/20 21:50:57
Done.
|
+ if (!render_view()->GetWebView()->mainFrame()->isWebRemoteFrame()) { |
Charlie Reis
2015/03/20 21:37:52
Is there a reason to do !isWebRemoteFrame() rather
alexmos
2015/03/20 21:50:57
Thanks, fixed. Just forgot to switch it around.
|
+ // navigation_start in ms. |
+ uint64 start = 1000 * (render_view()->GetMainRenderFrame()->GetWebFrame()-> |
+ performance().navigationStart()); |
+ uint64 now = (base::TimeTicks::Now() - base::TimeTicks::UnixEpoch()) |
+ .InMilliseconds(); |
+ DCHECK(now >= start); |
+ delta = base::TimeDelta::FromMilliseconds(now - start); |
+ } |
render_view()->Send(new ChromeViewHostMsg_LogEvent( |
render_view()->GetRoutingID(), page_seq_no_, event, delta)); |
} |