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

Side by Side Diff: components/web_view/frame_tree.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 unified diff | Download patch
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_tree.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_WEB_VIEW_FRAME_TREE_H_ 5 #ifndef COMPONENTS_WEB_VIEW_FRAME_TREE_H_
6 #define COMPONENTS_WEB_VIEW_FRAME_TREE_H_ 6 #define COMPONENTS_WEB_VIEW_FRAME_TREE_H_
7 7
8 #include "base/time/time.h"
8 #include "components/mus/public/interfaces/view_tree.mojom.h" 9 #include "components/mus/public/interfaces/view_tree.mojom.h"
9 #include "components/web_view/frame.h" 10 #include "components/web_view/frame.h"
10 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" 11 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
11 #include "url/gurl.h" 12 #include "url/gurl.h"
12 13
13 namespace mojo { 14 namespace mojo {
14 class String; 15 class String;
15 } 16 }
16 17
17 namespace web_view { 18 namespace web_view {
(...skipping 16 matching lines...) Expand all
34 // outlives FrameTree. 35 // outlives FrameTree.
35 // |client_properties| is the client properties for the root frame. 36 // |client_properties| is the client properties for the root frame.
36 // |root_app_id| is a unique identifier of the app providing |root_client|. 37 // |root_app_id| is a unique identifier of the app providing |root_client|.
37 // See Frame for details on app id's. 38 // See Frame for details on app id's.
38 FrameTree(uint32_t root_app_id, 39 FrameTree(uint32_t root_app_id,
39 mus::View* view, 40 mus::View* view,
40 mojo::ViewTreeClientPtr view_tree_client, 41 mojo::ViewTreeClientPtr view_tree_client,
41 FrameTreeDelegate* delegate, 42 FrameTreeDelegate* delegate,
42 mojom::FrameClient* root_client, 43 mojom::FrameClient* root_client,
43 scoped_ptr<FrameUserData> user_data, 44 scoped_ptr<FrameUserData> user_data,
44 const Frame::ClientPropertyMap& client_properties); 45 const Frame::ClientPropertyMap& client_properties,
46 base::TimeTicks navigation_start_time);
45 ~FrameTree(); 47 ~FrameTree();
46 48
47 const Frame* root() const { return root_; } 49 const Frame* root() const { return root_; }
48 Frame* root() { return root_; } 50 Frame* root() { return root_; }
49 uint32_t change_id() const { return change_id_; } 51 uint32_t change_id() const { return change_id_; }
50 52
51 private: 53 private:
52 friend class Frame; 54 friend class Frame;
53 55
54 // Creates a new Frame parented to |parent|. The Frame is considered shared in 56 // Creates a new Frame parented to |parent|. The Frame is considered shared in
(...skipping 28 matching lines...) Expand all
83 double progress_; 85 double progress_;
84 86
85 uint32_t change_id_; 87 uint32_t change_id_;
86 88
87 DISALLOW_COPY_AND_ASSIGN(FrameTree); 89 DISALLOW_COPY_AND_ASSIGN(FrameTree);
88 }; 90 };
89 91
90 } // namespace web_view 92 } // namespace web_view
91 93
92 #endif // COMPONENTS_WEB_VIEW_FRAME_TREE_H_ 94 #endif // COMPONENTS_WEB_VIEW_FRAME_TREE_H_
OLDNEW
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698