mandoline/ui/browser/merged_service_provider.h - Issue 1139123006: Fork the mojo shell interfaces used by Mandoline.

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/ui/browser/merged_service_provider.h

Issue 1139123006: Fork the mojo shell interfaces used by Mandoline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes 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:

Index: mandoline/ui/browser/merged_service_provider.h

diff --git a/mandoline/ui/browser/merged_service_provider.h b/mandoline/ui/browser/merged_service_provider.h

index 52fcea2f92436baea2cd2a923f985d42a9cbc924..20a94d5dbe6c0e885a206906e5ed580f627877f6 100644

--- a/mandoline/ui/browser/merged_service_provider.h

+++ b/mandoline/ui/browser/merged_service_provider.h

@@ -7,9 +7,9 @@

#include "base/memory/scoped_ptr.h"

#include "mandoline/services/navigation/public/interfaces/navigation.mojom.h"

-#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"

+#include "mojo/application/public/cpp/interface_factory.h"

+#include "mojo/application/public/interfaces/service_provider.mojom.h"

#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"

-#include "third_party/mojo/src/mojo/public/interfaces/application/service_provider.mojom.h"

namespace mandoline {