Split Mandoline-specific components out of mojo:core_services.

Remove mojo:desktop_ui and mojo:omnibox aliases from core_services.

Note: mojo:desktop_ui wasn't even resolving to mojo://core_services/.
(mojo scheme isn't registered prior to mandoline/app/desktop/main.cc)

Upload the additional mojo:omnibox component with Mandoline binaries.
(mojo:desktop_ui was already being uploaded for the app+resources)

Also, don't build mandoline/ui/phone_ui for Linux desktop builds.

BUG=NONE
TEST=Mandoline still works as intended.
R=ben@chromium.org

Review URL: https://codereview.chromium.org/1465843003

Cr-Commit-Position: refs/heads/master@{#360963}

7 files changed, 8 insertions, 48 deletions

diff --git a/mandoline/app/register_local_aliases.cc b/mandoline/app/register_local_aliases.cc
index f71abfa..b9c7375 100644
--- a/mandoline/app/register_local_aliases.cc
+++ b/mandoline/app/register_local_aliases.cc
@@ -31,13 +31,6 @@ void RegisterLocalAliases(mojo::package_manager::PackageManagerImpl* manager) {
       GURL("mojo:resource_provider"), GURL("mojo:core_services"), "Files");
 #endif
 
-#if defined(USE_AURA)
-  manager->RegisterApplicationPackageAlias(GURL("mojo:desktop_ui"),
-                                           GURL("mojo:core_services"),
-                                           "Core");
-  manager->RegisterApplicationPackageAlias(
-      GURL("mojo:omnibox"), GURL("mojo:core_services"), "Core");
-#endif
   manager->RegisterApplicationPackageAlias(
       GURL("mojo:web_view"), GURL("mojo:core_services"), "Core");
   manager->RegisterApplicationPackageAlias(
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn
index 0f2fe06..db14fa2 100644
--- a/mandoline/services/core_services/BUILD.gn
+++ b/mandoline/services/core_services/BUILD.gn
@@ -76,13 +76,4 @@ source_set("sources") {
   } else {
     sources += [ "application_delegate_factory_default.cc" ]
   }
-
-  if (use_aura) {
-    deps += [
-      "//components/mus/public/cpp",
-      "//mandoline/ui/desktop_ui:lib",
-      "//mandoline/ui/omnibox:lib",
-    ]
-    sources += [ "application_delegate_factory_aura.cc" ]
-  }
 }
diff --git a/mandoline/services/core_services/application_delegate_factory.h b/mandoline/services/core_services/application_delegate_factory.h
index d92bc68..537d9f9 100644
--- a/mandoline/services/core_services/application_delegate_factory.h
+++ b/mandoline/services/core_services/application_delegate_factory.h
@@ -27,11 +27,6 @@ scoped_ptr<mojo::ApplicationDelegate> CreateApplicationDelegateNotAndroid(
     const std::string& url);
 #endif
 
-#if defined(USE_AURA)
-scoped_ptr<mojo::ApplicationDelegate> CreateApplicationDelegateAura(
-    const std::string& url);
-#endif
-
 }  // namespace core_services
 
 #endif  // MANDOLINE_SERVICES_CORE_SERVICES_APPLICATION_DELEGATE_FACTORY_H_
diff --git a/mandoline/services/core_services/application_delegate_factory_aura.cc b/mandoline/services/core_services/application_delegate_factory_aura.cc
deleted file mode 100644
index c061bd8..0000000
--- a/mandoline/services/core_services/application_delegate_factory_aura.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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/services/core_services/application_delegate_factory.h"
-
-#include "mandoline/ui/desktop_ui/browser_manager.h"
-#include "mandoline/ui/omnibox/omnibox_application.h"
-
-namespace core_services {
-
-scoped_ptr<mojo::ApplicationDelegate> CreateApplicationDelegateAura(
-    const std::string& url) {
-  if (url == "mojo://desktop_ui/")
-    return make_scoped_ptr(new mandoline::BrowserManager);
-  else if (url == "mojo://omnibox/")
-    return make_scoped_ptr(new mandoline::OmniboxApplication);
-  return nullptr;
-}
-
-}  // namespace core_services
diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc
index 7c970f2..f7fd32a 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -136,9 +136,6 @@ void CoreServicesApplicationDelegate::StartApplication(
   } else if (url == "mojo://web_view/") {
     delegate.reset(new web_view::WebViewApplicationDelegate);
   } else {
-#if defined(USE_AURA)
-    delegate = CreateApplicationDelegateAura(url);
-#endif
 #if !defined(OS_ANDROID)
     if (!delegate)
       delegate = CreateApplicationDelegateNotAndroid(url);
diff --git a/mandoline/tools/data/FILES.cfg b/mandoline/tools/data/FILES.cfg
index 3f54ab9..74da561 100644
--- a/mandoline/tools/data/FILES.cfg
+++ b/mandoline/tools/data/FILES.cfg
@@ -51,6 +51,11 @@ FILES = [
     'platforms': ['win'],
   },
   {
+    'filepath': 'omnibox',
+    'platforms': ['linux', 'win'],
+    'directory': True,
+  },
+  {
     'filepath': 'pdf_viewer',
     'platforms': ['linux', 'win'],
     'directory': True,
diff --git a/mandoline/ui/BUILD.gn b/mandoline/ui/BUILD.gn
index 1c7de33..d43dddc 100644
--- a/mandoline/ui/BUILD.gn
+++ b/mandoline/ui/BUILD.gn
@@ -5,13 +5,13 @@
 import("//build/config/ui.gni")
 
 group("ui") {
-  deps = [
-    "phone_ui",
-  ]
+  deps = []
   if (use_aura) {
     deps += [
       "desktop_ui",
       "omnibox",
     ]
+  } else if (is_android) {
+    deps += [ "phone_ui" ]
   }
 }