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

Unified Diff: components/html_viewer/html_frame.h

Issue 1391963004: Correctly record and pass around navigation start time. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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: components/html_viewer/html_frame.h
diff --git a/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h
index c55eb257fa19bca0de202c17b7be601be48dbfdb..5619df1be863b0b83fb73f54d0d8d715b6b314de 100644
--- a/components/html_viewer/html_frame.h
+++ b/components/html_viewer/html_frame.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
#include "cc/layers/surface_layer.h"
#include "components/html_viewer/html_frame_tree_manager.h"
#include "components/html_viewer/replicated_frame_state.h"
@@ -147,7 +148,8 @@ class HTMLFrame : public blink::WebFrameClient,
// Returns true if this or one of the frames descendants is local.
bool HasLocalDescendant() const;
- void LoadRequest(const blink::WebURLRequest& request);
+ void LoadRequest(const blink::WebURLRequest& request,
+ base::TimeTicks navigation_start_time);
protected:
virtual ~HTMLFrame();
@@ -275,6 +277,7 @@ class HTMLFrame : public blink::WebFrameClient,
uint32_t view_id,
web_view::mojom::ViewConnectType view_connect_type,
mojo::Array<web_view::mojom::FrameDataPtr> frame_data,
+ int64_t navigation_start_time_ticks,
const OnConnectCallback& callback) override;
void OnFrameAdded(uint32_t change_id,
web_view::mojom::FrameDataPtr frame_data) override;
@@ -357,6 +360,8 @@ class HTMLFrame : public blink::WebFrameClient,
// received response to it.
bool pending_navigation_;
+ base::TimeTicks navigation_start_time_;
+
base::WeakPtrFactory<HTMLFrame> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(HTMLFrame);

Powered by Google App Engine
This is Rietveld 408576698