services/nacl/content_handler_main.cc - Issue 1398213003: Refactored Non-SFI and SFI NaCl into separate directories.

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: services/nacl/content_handler_main.cc

Issue 1398213003: Refactored Non-SFI and SFI NaCl into separate directories. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 2 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: services/nacl/content_handler_main.cc

diff --git a/services/nacl/content_handler_main.cc b/services/nacl/content_handler_main.cc

index b3644228f14efde96107bcc84fd4bb1d5b1ae055..7804d89577c32c629a1f723bdd0266d6256b2bbf 100644

--- a/services/nacl/content_handler_main.cc

+++ b/services/nacl/content_handler_main.cc

@@ -10,13 +10,13 @@

#include "mojo/application/content_handler_factory.h"

#include "mojo/data_pipe_utils/data_pipe_utils.h"

#include "mojo/message_pump/message_pump_mojo.h"

+#include "mojo/nacl/sfi/nacl_bindings/monacl_sel_main.h"

#include "mojo/public/c/system/main.h"

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

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

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

#include "mojo/services/network/public/interfaces/network_service.mojom.h"

#include "mojo/services/network/public/interfaces/url_loader.mojom.h"

-#include "nacl_bindings/monacl_sel_main.h"

#include "native_client/src/public/nacl_desc.h"

#include "url/gurl.h"

« no previous file with comments | « services/nacl/BUILD.gn ('k') | services/nacl/content_handler_main_nonsfi.cc » ('j') | no next file with comments »