mojo/services/network/network_service.cc - Issue 885443002: Roll Chrome into Mojo.

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: mojo/services/network/network_service.cc

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Rebase to ToT mojo Created 5 years, 11 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: mojo/services/network/network_service.cc

diff --git a/mojo/services/network/network_service.cc b/mojo/services/network/network_service.cc

index 0f604fbdae998ec7611b38c25d802882558276a7..6a82903006973ad032dfdd9853332f1709191ee1 100644

--- a/mojo/services/network/network_service.cc

+++ b/mojo/services/network/network_service.cc

@@ -9,13 +9,13 @@

#include "base/message_loop/message_loop.h"

#include "base/path_service.h"

#include "mojo/application/application_runner_chromium.h"

+#include "mojo/services/network/network_context.h"

+#include "mojo/services/network/network_service_impl.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/interface_factory.h"

#include "mojo/public/cpp/bindings/interface_ptr.h"

-#include "mojo/services/network/network_context.h"

-#include "mojo/services/network/network_service_impl.h"

class NetworkServiceDelegate

: public mojo::ApplicationDelegate,