Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(763)

Unified Diff: mandoline/services/core_services/core_services_application_delegate.cc

Issue 1141593004: core_services: Use network_service in core_services on android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ifdefs Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mandoline/services/core_services/core_services_application_delegate.cc
diff --git a/mandoline/services/core_services/core_services_application_delegate.cc b/mandoline/services/core_services/core_services_application_delegate.cc
index 90e9314d1e6dd5b5ec5900eb51287f6d5d56f97d..5104cacc6904c675671f3a8126ac87ff31e57872 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -13,12 +13,12 @@
#include "mojo/application/public/cpp/application_connection.h"
#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/common/message_pump_mojo.h"
+#include "mojo/services/network/network_service_delegate.h"
#include "mojo/services/tracing/tracing_app.h"
#include "url/gurl.h"
#if !defined(OS_ANDROID)
#include "mandoline/ui/omnibox/omnibox_impl.h"
-#include "mojo/services/network/network_service_delegate.h"
#endif
namespace core_services {
@@ -128,9 +128,9 @@ void CoreServicesApplicationDelegate::StartApplication(
scoped_ptr<mojo::ApplicationDelegate> delegate;
if (url == "mojo://clipboard/")
delegate.reset(new clipboard::ClipboardApplicationDelegate);
-#if !defined(OS_ANDROID)
else if (url == "mojo://network_service/")
delegate.reset(new NetworkServiceDelegate);
+#if !defined(OS_ANDROID)
else if (url == "mojo://omnibox/")
delegate.reset(new mandoline::OmniboxImpl);
#endif
« mandoline/services/core_services/BUILD.gn ('K') | « mandoline/services/core_services/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698