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

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

Issue 1276163002: Revert of Sandbox html_viewer on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « mandoline/services/core_services/DEPS ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 491a5223cb6d9744ff62088b3499c8943c0441b7..e3ff97755771d9b746f6a51f7523802a7a4e3297 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -26,10 +26,6 @@
#include "components/resource_provider/resource_provider_app.h"
#include "components/view_manager/view_manager_app.h"
#include "mojo/services/network/network_service_delegate.h"
-#endif
-
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
-#include "components/font_service/font_service_app.h"
#endif
namespace core_services {
@@ -134,10 +130,6 @@
delegate.reset(new clipboard::ClipboardApplicationDelegate);
} else if (url == "mojo://filesystem/") {
delegate.reset(new filesystem::FileSystemApp);
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
- } else if (url == "mojo://font_service/") {
- delegate.reset(new font_service::FontServiceApp);
-#endif
} else if (url == "mojo://surfaces_service/") {
delegate.reset(new surfaces::SurfacesServiceApplication);
} else if (url == "mojo://tracing/") {
« no previous file with comments | « mandoline/services/core_services/DEPS ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698