OLD | NEW |
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/pending_web_view_load.h" | 5 #include "components/web_view/pending_web_view_load.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
8 #include "base/callback.h" | 10 #include "base/callback.h" |
9 #include "components/web_view/frame_connection.h" | 11 #include "components/web_view/frame_connection.h" |
10 #include "components/web_view/web_view_impl.h" | 12 #include "components/web_view/web_view_impl.h" |
11 | 13 |
12 namespace web_view { | 14 namespace web_view { |
13 | 15 |
14 PendingWebViewLoad::PendingWebViewLoad(WebViewImpl* web_view) | 16 PendingWebViewLoad::PendingWebViewLoad(WebViewImpl* web_view) |
15 : web_view_(web_view), is_content_handler_id_valid_(false) {} | 17 : web_view_(web_view), is_content_handler_id_valid_(false) {} |
16 | 18 |
17 PendingWebViewLoad::~PendingWebViewLoad() {} | 19 PendingWebViewLoad::~PendingWebViewLoad() {} |
18 | 20 |
19 void PendingWebViewLoad::Init(mojo::URLRequestPtr request) { | 21 void PendingWebViewLoad::Init(mojo::URLRequestPtr request) { |
20 DCHECK(!frame_connection_); | 22 DCHECK(!frame_connection_); |
21 pending_url_ = GURL(request->url); | 23 pending_url_ = GURL(request->url); |
22 navigation_start_time_ = | 24 navigation_start_time_ = |
23 base::TimeTicks::FromInternalValue(request->originating_time_ticks); | 25 base::TimeTicks::FromInternalValue(request->originating_time_ticks); |
24 frame_connection_.reset(new FrameConnection); | 26 frame_connection_.reset(new FrameConnection); |
25 frame_connection_->Init(web_view_->app_, request.Pass(), | 27 frame_connection_->Init(web_view_->app_, std::move(request), |
26 base::Bind(&PendingWebViewLoad::OnGotContentHandlerID, | 28 base::Bind(&PendingWebViewLoad::OnGotContentHandlerID, |
27 base::Unretained(this))); | 29 base::Unretained(this))); |
28 } | 30 } |
29 | 31 |
30 void PendingWebViewLoad::OnGotContentHandlerID() { | 32 void PendingWebViewLoad::OnGotContentHandlerID() { |
31 is_content_handler_id_valid_ = true; | 33 is_content_handler_id_valid_ = true; |
32 if (web_view_->root_) | 34 if (web_view_->root_) |
33 web_view_->OnLoad(pending_url_); | 35 web_view_->OnLoad(pending_url_); |
34 // The else case is handled by WebViewImpl when it gets the Window (|root_|). | 36 // The else case is handled by WebViewImpl when it gets the Window (|root_|). |
35 } | 37 } |
36 | 38 |
37 } // namespace web_view | 39 } // namespace web_view |
OLD | NEW |