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

Unified Diff: components/web_view/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
« no previous file with comments | « components/html_viewer/html_frame_apptest.cc ('k') | components/web_view/frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/frame.h
diff --git a/components/web_view/frame.h b/components/web_view/frame.h
index 899781b1b84cf113f3c993bd4c585f1ad8fc263c..361c66a869823623bdc021e11ac417b2db8809d0 100644
--- a/components/web_view/frame.h
+++ b/components/web_view/frame.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
+#include "base/time/time.h"
#include "components/mus/public/cpp/types.h"
#include "components/mus/public/cpp/view_observer.h"
#include "components/web_view/public/interfaces/frame.mojom.h"
@@ -68,7 +69,8 @@ class Frame : public mus::ViewObserver, public mojom::Frame {
void Init(Frame* parent,
mojo::ViewTreeClientPtr view_tree_client,
- mojo::InterfaceRequest<mojom::Frame> frame_request);
+ mojo::InterfaceRequest<mojom::Frame> frame_request,
+ base::TimeTicks navigation_start_time);
// Walks the View tree starting at |view| going up returning the first
// Frame that is associated with |view|. For example, if |view|
@@ -158,7 +160,8 @@ class Frame : public mus::ViewObserver, public mojom::Frame {
void InitClient(ClientType client_type,
scoped_ptr<FrameUserDataAndBinding> data_and_binding,
mojo::ViewTreeClientPtr view_tree_client,
- mojo::InterfaceRequest<mojom::Frame> frame_request);
+ mojo::InterfaceRequest<mojom::Frame> frame_request,
+ base::TimeTicks navigation_start_time);
// Callback from OnConnect(). This does nothing (other than destroying
// |data_and_binding|). See InitClient() for details as to why destruction of
@@ -173,14 +176,16 @@ class Frame : public mus::ViewObserver, public mojom::Frame {
void OnWillNavigateAck(mojom::FrameClient* frame_client,
scoped_ptr<FrameUserData> user_data,
mojo::ViewTreeClientPtr view_tree_client,
- uint32 app_id);
+ uint32 app_id,
+ base::TimeTicks navigation_start_time);
// Completes a navigation request; swapping the existing FrameClient to the
// supplied arguments.
void ChangeClient(mojom::FrameClient* frame_client,
scoped_ptr<FrameUserData> user_data,
mojo::ViewTreeClientPtr view_tree_client,
- uint32 app_id);
+ uint32 app_id,
+ base::TimeTicks navigation_start_time);
void SetView(mus::View* view);
@@ -196,6 +201,7 @@ class Frame : public mus::ViewObserver, public mojom::Frame {
// no View the navigation waits until the View is available.
void StartNavigate(mojo::URLRequestPtr request);
void OnCanNavigateFrame(const GURL& url,
+ base::TimeTicks navigation_start_time,
uint32_t app_id,
mojom::FrameClient* frame_client,
scoped_ptr<FrameUserData> user_data,
« no previous file with comments | « components/html_viewer/html_frame_apptest.cc ('k') | components/web_view/frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698