components/kiosk_wm/merged_service_provider.h - Issue 1110823002: Fix Mojo and Mandoline builds.

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: components/kiosk_wm/merged_service_provider.h

Issue 1110823002: Fix Mojo and Mandoline builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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: components/kiosk_wm/merged_service_provider.h

diff --git a/components/kiosk_wm/merged_service_provider.h b/components/kiosk_wm/merged_service_provider.h

index 1606ea811c00912e9fd881ed5d8d00149c1f893c..c628078774dabc242b59748f1cbff16d07520d69 100644

--- a/components/kiosk_wm/merged_service_provider.h

+++ b/components/kiosk_wm/merged_service_provider.h

@@ -6,10 +6,10 @@

#define COMPONENTS_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_

#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 "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"

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

-#include "third_party/mojo_services/src/navigation/public/interfaces/navigation.mojom.h"

namespace kiosk_wm {

« no previous file with comments | « no previous file | mandoline/app/desktop/launcher_process.cc » ('j') | no next file with comments »