| Index: components/web_view/web_view_impl.cc
|
| diff --git a/components/web_view/web_view_impl.cc b/components/web_view/web_view_impl.cc
|
| index 84675d14f52f6670d1f8c0b979dd63f8bf2fd6c1..78cf960ac492e8e458b7826992d1d4e7a28b5f26 100644
|
| --- a/components/web_view/web_view_impl.cc
|
| +++ b/components/web_view/web_view_impl.cc
|
| @@ -59,7 +59,8 @@ WebViewImpl::~WebViewImpl() {
|
| }
|
| }
|
|
|
| -void WebViewImpl::OnLoad() {
|
| +void WebViewImpl::OnLoad(const std::string& pending_url) {
|
| + client_->TopLevelNavigationStarted(pending_url);
|
| scoped_ptr<PendingWebViewLoad> pending_load(pending_load_.Pass());
|
| scoped_ptr<FrameConnection> frame_connection(
|
| pending_load->frame_connection());
|
| @@ -122,7 +123,7 @@ void WebViewImpl::OnEmbed(mus::View* root) {
|
| content_->AddObserver(this);
|
|
|
| if (pending_load_ && pending_load_->is_content_handler_id_valid())
|
| - OnLoad();
|
| + OnLoad(pending_load_->pending_url());
|
| }
|
|
|
| void WebViewImpl::OnConnectionLost(mus::ViewTreeConnection* connection) {
|
| @@ -175,7 +176,7 @@ void WebViewImpl::TitleChanged(const mojo::String& title) {
|
| }
|
|
|
| void WebViewImpl::NavigateTopLevel(Frame* source, mojo::URLRequestPtr request) {
|
| - client_->TopLevelNavigate(request.Pass());
|
| + client_->TopLevelNavigateRequest(request.Pass());
|
| }
|
|
|
| void WebViewImpl::CanNavigateFrame(Frame* target,
|
| @@ -197,7 +198,7 @@ void WebViewImpl::DidCommitProvisionalLoad(Frame* frame) {
|
| void WebViewImpl::HandlePageNavigateRequest(const GURL& url) {
|
| mojo::URLRequestPtr request(mojo::URLRequest::New());
|
| request->url = url.spec();
|
| - client_->TopLevelNavigate(request.Pass());
|
| + client_->TopLevelNavigateRequest(request.Pass());
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|