mandoline/services/core_services/core_services_application_delegate.cc - Issue 1245683004: Mandoline: Merge Surfaces and Views apps

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Rebased 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

« components/view_manager/surfaces/top_level_display_client.cc ('K') | « mandoline/services/core_services/BUILD.gn ('k') | mandoline/ui/aura/surface_binding.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 d3ef94685acfcf9fe628be02b56a7b2d8b87b8ed..39e8c066b1c227bb142349915e0c7cee305c7a42 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/ui/browser/browser_manager.h"

#include "mojo/application/public/cpp/application_connection.h"

#include "mojo/application/public/cpp/application_impl.h"

@@ -138,8 +137,6 @@ void CoreServicesApplicationDelegate::StartApplication(

} 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/") {

delegate.reset(new tracing::TracingApp);

#if defined(USE_AURA)