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

mandoline/ui/desktop_ui/browser_window.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 "mandoline/ui/desktop_ui/browser_window.h"
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 216 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, web_view::mojom::WebViewClient implementation:
 
-void BrowserWindow::TopLevelNavigate(mojo::URLRequestPtr request) {
+void BrowserWindow::TopLevelNavigateRequest(mojo::URLRequestPtr request) {
   Embed(request.Pass());
 }
 
+void BrowserWindow::TopLevelNavigationStarted(const mojo::String& url) {
+  GURL gurl(url);
+  bool changed = current_url_ != gurl;
+  current_url_ = gurl;
+  if (changed)
+    toolbar_view_->SetOmniboxText(base::UTF8ToUTF16(current_url_.spec()));
+}
+
 void BrowserWindow::LoadingStateChanged(bool is_loading, double progress) {
   progress_bar_->SetIsLoading(is_loading);
   progress_bar_->SetProgress(progress);
 }
 
 void BrowserWindow::BackForwardChanged(
     web_view::mojom::ButtonState back_button,
     web_view::mojom::ButtonState forward_button) {
   toolbar_view_->SetBackForwardEnabled(
       back_button == web_view::mojom::ButtonState::BUTTON_STATE_ENABLED,
@@ skipping 10 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, ViewEmbedder implementation:
 
 void BrowserWindow::Embed(mojo::URLRequestPtr request) {
   const std::string string_url = request->url.To<std::string>();
   if (string_url == "mojo:omnibox") {
     EmbedOmnibox();
     return;
   }
-
-  GURL gurl(string_url);
-  bool changed = current_url_ != gurl;
-  current_url_ = gurl;
-  if (changed)
-    toolbar_view_->SetOmniboxText(base::UTF8ToUTF16(current_url_.spec()));
-
   web_view_.web_view()->LoadRequest(request.Pass());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserWindow, mojo::InterfaceFactory<ViewEmbedder> implementation:
 
 void BrowserWindow::Create(mojo::ApplicationConnection* connection,
                            mojo::InterfaceRequest<ViewEmbedder> request) {
   view_embedder_bindings_.AddBinding(this, request.Pass());
 }
@@ skipping 73 matching lines @@
   omnibox_view_->Embed(view_tree_client.Pass());
 
   // TODO(beng): This should be handled sufficiently by
   //             OmniboxImpl::ShowWindow() but unfortunately view manager policy
   //             currently prevents the embedded app from changing window z for
   //             its own window.
   omnibox_view_->MoveToFront();
 }
 
 }  // namespace mandoline