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

Side by Side Diff: components/web_view/web_view_impl.cc

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
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 #include "components/web_view/web_view_impl.h" 5 #include "components/web_view/web_view_impl.h"
6 6
7 #include <queue> 7 #include <queue>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 devtools_service::DevToolsAgentPtr forward_agent; 92 devtools_service::DevToolsAgentPtr forward_agent;
93 frame_connection->application_connection()->ConnectToService( 93 frame_connection->application_connection()->ConnectToService(
94 &forward_agent); 94 &forward_agent);
95 devtools_agent_->AttachFrame(forward_agent.Pass(), &client_properties); 95 devtools_agent_->AttachFrame(forward_agent.Pass(), &client_properties);
96 } 96 }
97 97
98 mojom::FrameClient* frame_client = frame_connection->frame_client(); 98 mojom::FrameClient* frame_client = frame_connection->frame_client();
99 const uint32_t content_handler_id = frame_connection->GetContentHandlerID(); 99 const uint32_t content_handler_id = frame_connection->GetContentHandlerID();
100 frame_tree_.reset(new FrameTree(content_handler_id, content_, 100 frame_tree_.reset(new FrameTree(content_handler_id, content_,
101 view_tree_client.Pass(), this, frame_client, 101 view_tree_client.Pass(), this, frame_client,
102 frame_connection.Pass(), client_properties)); 102 frame_connection.Pass(), client_properties,
103 pending_load->navigation_start_time()));
103 } 104 }
104 105
105 //////////////////////////////////////////////////////////////////////////////// 106 ////////////////////////////////////////////////////////////////////////////////
106 // WebViewImpl, WebView implementation: 107 // WebViewImpl, WebView implementation:
107 108
108 void WebViewImpl::LoadRequest(mojo::URLRequestPtr request) { 109 void WebViewImpl::LoadRequest(mojo::URLRequestPtr request) {
109 navigation_controller_.LoadURL(request.Pass()); 110 navigation_controller_.LoadURL(request.Pass());
110 } 111 }
111 112
112 void WebViewImpl::GetViewTreeClient( 113 void WebViewImpl::GetViewTreeClient(
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 all_frames.push_back(current); 285 all_frames.push_back(current);
285 } 286 }
286 return all_frames; 287 return all_frames;
287 } 288 }
288 289
289 mojom::WebViewClient* WebViewImpl::GetWebViewClient() { 290 mojom::WebViewClient* WebViewImpl::GetWebViewClient() {
290 return client_.get(); 291 return client_.get();
291 } 292 }
292 293
293 } // namespace web_view 294 } // namespace web_view
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698