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

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

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed bot issues (I hope) 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/BUILD.gn ('k') | mandoline/tab/frame_connection.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 80b2c7fdffa986f5d64adc04794e57291620a15a..7cb68de90b0d7b1cd2db9beb6a496c6af46a7bbd 100644
--- a/mandoline/services/core_services/core_services_application_delegate.cc
+++ b/mandoline/services/core_services/core_services_application_delegate.cc
@@ -9,7 +9,6 @@
#include "base/threading/simple_thread.h"
#include "components/clipboard/clipboard_application_delegate.h"
#include "components/filesystem/file_system_app.h"
-#include "components/view_manager/surfaces/surfaces_service_application.h"
#include "mandoline/services/core_services/application_delegate_factory.h"
#include "mandoline/tab/web_view_application_delegate.h"
#include "mandoline/ui/browser/browser_manager.h"
@@ -122,8 +121,6 @@ void CoreServicesApplicationDelegate::StartApplication(
delegate.reset(new clipboard::ClipboardApplicationDelegate);
} else if (url == "mojo://filesystem/") {
delegate.reset(new filesystem::FileSystemApp);
- } else if (url == "mojo://surfaces_service/") {
- delegate.reset(new surfaces::SurfacesServiceApplication);
} else if (url == "mojo://tracing/") {
delegate.reset(new tracing::TracingApp);
} else if (url == "mojo://web_view/") {
« no previous file with comments | « mandoline/services/core_services/BUILD.gn ('k') | mandoline/tab/frame_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698