Move navigations with POST or referrer to the shell.

mandoline/ui/browser/browser.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/browser/browser.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager_init.h"
@@ skipping 28 matching lines @@
   exposed_services_impl_.AddService<mojo::NavigatorHost>(this);
 }
 
 Browser::~Browser() {
   // Destruct ui_ manually while |this| is alive and reset the pointer first.
   // This is to avoid a double delete when OnViewManagerDisconnected gets
   // called.
   delete ui_.release();
 }
 
-void Browser::ReplaceContentWithURL(const mojo::String& url) {
-  Embed(url, nullptr, nullptr);
+void Browser::ReplaceContentWithRequest(mojo::URLRequestPtr request) {
+  Embed(request.Pass(), nullptr, nullptr);
 }
 
 void Browser::Initialize(mojo::ApplicationImpl* app) {
   view_manager_init_.reset(new mojo::ViewManagerInit(app, this, this));
 
   ui_.reset(BrowserUI::Create(this, app));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::CommandLine::StringVector args = command_line->GetArgs();
   if (args.empty()) {
@@ skipping 36 matching lines @@
   view_manager_init_->view_manager_root()->SetViewportSize(
       mojo::Size::From(GetInitialViewportSize()));
 
   root_->AddChild(content_);
   content_->SetVisible(true);
 
   view_manager_init_->view_manager_root()->AddAccelerator(
       mojo::KEYBOARD_CODE_BROWSER_BACK, mojo::EVENT_FLAGS_NONE);
 
   // Now that we're ready, either load a pending url or the default url.
-  if (!pending_url_.empty())
-    Embed(pending_url_, services.Pass(), exposed_services.Pass());
-  else if (!default_url_.empty())
-    Embed(default_url_, services.Pass(), exposed_services.Pass());
+  if (pending_request_) {
+    Embed(pending_request_.Pass(), services.Pass(), exposed_services.Pass());
+  } else if (!default_url_.empty()) {
+    mojo::URLRequestPtr request(mojo::URLRequest::New());
+    request->url = mojo::String::From(default_url_);
+    Embed(request.Pass(), services.Pass(), exposed_services.Pass());
+  }
 }
 
 void Browser::OnViewManagerDisconnected(
     mojo::ViewManager* view_manager) {
   ui_.reset();
   root_ = nullptr;
 }
 
 void Browser::OnAccelerator(mojo::EventPtr event) {
   DCHECK_EQ(mojo::KEYBOARD_CODE_BROWSER_BACK,
             event->key_data->windows_key_code);
   navigator_host_.RequestNavigateHistory(-1);
 }
 
 void Browser::OpenURL(const mojo::String& url) {
   omnibox_->SetVisible(false);
-  ReplaceContentWithURL(url);
+  mojo::URLRequestPtr request(mojo::URLRequest::New());
+  request->url = mojo::String::From(url);
+  ReplaceContentWithRequest(request.Pass());
 }
 
-void Browser::Embed(const mojo::String& url,
+void Browser::Embed(mojo::URLRequestPtr request,
                     mojo::InterfaceRequest<mojo::ServiceProvider> services,
                     mojo::ServiceProviderPtr exposed_services) {
-  if (url == "mojo:omnibox") {
-    ShowOmnibox(url, services.Pass(), exposed_services.Pass());
+  std::string string_url = request->url.To<std::string>();
+  if (string_url == "mojo:omnibox") {
+    ShowOmnibox(request.Pass(), services.Pass(), exposed_services.Pass());
     return;
   }
 
   // We can get Embed calls before we've actually been
   // embedded into the root view and content_ is created.
   // Just save the last url, we'll embed it when we're ready.
   if (!content_) {
-    pending_url_ = url;
+    pending_request_ = request.Pass();
     return;
   }
 
-  GURL gurl(url.To<base::string16>());
+  GURL gurl(string_url);
   bool changed = current_url_ != gurl;
   current_url_ = gurl;
   if (changed)
     ui_->OnURLChanged();
 
   merged_service_provider_.reset(
       new MergedServiceProvider(exposed_services.Pass(), this));
-  content_->Embed(url, services.Pass(),
+  content_->Embed(request.Pass(), services.Pass(),
                   merged_service_provider_->GetServiceProviderPtr().Pass());
 
-  navigator_host_.RecordNavigation(url);
+  navigator_host_.RecordNavigation(gurl.spec());
 }
 
 void Browser::Create(mojo::ApplicationConnection* connection,
                      mojo::InterfaceRequest<mojo::NavigatorHost> request) {
   navigator_host_.Bind(request.Pass());
 }
 
 void Browser::Create(mojo::ApplicationConnection* connection,
                      mojo::InterfaceRequest<ViewEmbedder> request) {
   view_embedder_bindings_.AddBinding(this, request.Pass());
 }
 
 void Browser::ShowOmnibox(
-    const mojo::String& url,
+    mojo::URLRequestPtr request,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
   if (!omnibox_) {
     omnibox_ = root_->view_manager()->CreateView();
     root_->AddChild(omnibox_);
     omnibox_->SetVisible(true);
     omnibox_->SetBounds(root_->bounds());
   }
-  omnibox_->Embed(url, services.Pass(), exposed_services.Pass());
+  omnibox_->Embed(request.Pass(), services.Pass(), exposed_services.Pass());
 }
 
 }  // namespace mandoline