Get the omnibox to show up again. Sky's changes from yesterday removed the window manager interface…

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 18 matching lines @@
 }
 
 }  // namespace
 
 Browser::Browser()
     : root_(nullptr),
       content_(nullptr),
       omnibox_(nullptr),
       navigator_host_(this),
       ui_(nullptr) {
-  exposed_services_impl_.AddService(this);
+  exposed_services_impl_.AddService<mojo::NavigatorHost>(this);
 }
 
 Browser::~Browser() {
 }
 
 void Browser::ReplaceContentWithURL(const mojo::String& url) {
   Embed(url, nullptr, nullptr);
 }
 
 void Browser::Initialize(mojo::ApplicationImpl* app) {
@@ skipping 15 matching lines @@
 }
 
 bool Browser::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   // TODO: register embed interface here.
   return true;
 }
 
 bool Browser::ConfigureOutgoingConnection(
     mojo::ApplicationConnection* connection) {
+  connection->AddService<ViewEmbedder>(this);
   return true;
 }
 
 void Browser::OnEmbed(
     mojo::View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
   // Browser does not support being embedded more than once.
   CHECK(!root_);
 
@@ skipping 30 matching lines @@
   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);
 }
 
-void Browser::Create(mojo::ApplicationConnection* connection,
-                     mojo::InterfaceRequest<mojo::NavigatorHost> request) {
-  navigator_host_.Bind(request.Pass());
-}
-
-void Browser::ShowOmnibox(
-    const mojo::String& url,
-    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());
-}
-
 void Browser::Embed(const mojo::String& url,
                     mojo::InterfaceRequest<mojo::ServiceProvider> services,
                     mojo::ServiceProviderPtr exposed_services) {
   if (url == "mojo:omnibox") {
     ShowOmnibox(url, 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.
@@ skipping 10 matching lines @@
     ui_->OnURLChanged();
 
   merged_service_provider_.reset(
       new MergedServiceProvider(exposed_services.Pass(), this));
   content_->Embed(url, services.Pass(),
                   merged_service_provider_->GetServiceProviderPtr().Pass());
 
   navigator_host_.RecordNavigation(url);
 }
 
+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::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());
+}
+
 }  // namespace mandoline