mandoline: Make sure omnibox gets updated when navigating back/forwards.

components/web_view/web_view_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/web_view/web_view_impl.h"
 
 #include "base/command_line.h"
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/mus/public/cpp/scoped_view_ptr.h"
 #include "components/mus/public/cpp/view.h"
@@ skipping 41 matching lines @@
 
 WebViewImpl::~WebViewImpl() {
   if (content_)
     content_->RemoveObserver(this);
   if (root_) {
     root_->RemoveObserver(this);
     mus::ScopedViewPtr::DeleteViewOrViewManager(root_);
   }
 }
 
-void WebViewImpl::OnLoad() {
+void WebViewImpl::OnLoad(const GURL& pending_url) {
   // Frames are uniqued based on the id of the associated View. By creating a
   // new View each time through we ensure the renderers get a clean id, rather
   // than one they may know about and try to incorrectly use.
   if (content_) {
     content_->Destroy();
     DCHECK(!content_);
   }
 
+  client_->TopLevelNavigationStarted(pending_url.spec());
+
   content_ = root_->connection()->CreateView();
   content_->SetBounds(*mojo::Rect::From(
       gfx::Rect(0, 0, root_->bounds().width, root_->bounds().height)));
   root_->AddChild(content_);
   content_->SetVisible(true);
   content_->AddObserver(this);
 
   scoped_ptr<PendingWebViewLoad> pending_load(pending_load_.Pass());
   scoped_ptr<FrameConnection> frame_connection(
       pending_load->frame_connection());
@@ skipping 43 matching lines @@
 // WebViewImpl, mus::ViewTreeDelegate implementation:
 
 void WebViewImpl::OnEmbed(mus::View* root) {
   // We must have been granted embed root priviledges, otherwise we can't
   // Embed() in any descendants.
   DCHECK(root->connection()->IsEmbedRoot());
   root->AddObserver(this);
   root_ = root;
 
   if (pending_load_ && pending_load_->is_content_handler_id_valid())
-    OnLoad();
+    OnLoad(pending_load_->pending_url());
 }
 
 void WebViewImpl::OnConnectionLost(mus::ViewTreeConnection* connection) {
   root_ = nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, mus::ViewObserver implementation:
 
 void WebViewImpl::OnViewBoundsChanged(mus::View* view,
@@ skipping 33 matching lines @@
 
 void WebViewImpl::LoadingStateChanged(bool loading, double progress) {
   client_->LoadingStateChanged(loading, progress);
 }
 
 void WebViewImpl::TitleChanged(const mojo::String& title) {
   client_->TitleChanged(title);
 }
 
 void WebViewImpl::NavigateTopLevel(Frame* source, mojo::URLRequestPtr request) {
-  client_->TopLevelNavigate(request.Pass());
+  client_->TopLevelNavigateRequest(request.Pass());
 }
 
 void WebViewImpl::CanNavigateFrame(Frame* target,
                                    mojo::URLRequestPtr request,
                                    const CanNavigateFrameCallback& callback) {
   FrameConnection::CreateConnectionForCanNavigateFrame(
       app_, target, request.Pass(), callback);
 }
 
 void WebViewImpl::DidStartNavigation(Frame* frame) {}
 
 void WebViewImpl::DidCommitProvisionalLoad(Frame* frame) {
   navigation_controller_.FrameDidCommitProvisionalLoad(frame);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, FrameDevToolsAgentDelegate implementation:
 
 void WebViewImpl::HandlePageNavigateRequest(const GURL& url) {
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = url.spec();
-  client_->TopLevelNavigate(request.Pass());
+  client_->TopLevelNavigateRequest(request.Pass());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, NavigationControllerDelegate implementation:
 
 void WebViewImpl::OnNavigate(mojo::URLRequestPtr request) {
   pending_load_.reset(new PendingWebViewLoad(this));
   pending_load_->Init(request.Pass());
 }
 
 void WebViewImpl::OnDidNavigate() {
   client_->BackForwardChanged(navigation_controller_.CanGoBack()
                                   ? ButtonState::BUTTON_STATE_ENABLED
                                   : ButtonState::BUTTON_STATE_DISABLED,
                               navigation_controller_.CanGoForward()
                                   ? ButtonState::BUTTON_STATE_ENABLED
                                   : ButtonState::BUTTON_STATE_DISABLED);
 }
 
 }  // namespace web_view