net/proxy/proxy_resolver_factory_mojo.cc - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

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: net/proxy/proxy_resolver_factory_mojo.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 5 years, 1 month 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

Index: net/proxy/proxy_resolver_factory_mojo.cc

diff --git a/net/proxy/proxy_resolver_factory_mojo.cc b/net/proxy/proxy_resolver_factory_mojo.cc

index 32c1203e19b0dade14ed4cdb1318ab7ed4d832b5..592e7489f127b0d97e7d2bde8c68f3725f788183 100644

--- a/net/proxy/proxy_resolver_factory_mojo.cc

+++ b/net/proxy/proxy_resolver_factory_mojo.cc

@@ -13,6 +13,7 @@

#include "base/values.h"

#include "mojo/common/common_type_converters.h"

#include "mojo/common/url_type_converters.h"

+#include "mojo/public/cpp/bindings/binding.h"

#include "net/base/load_states.h"

#include "net/base/net_errors.h"

#include "net/dns/mojo_host_resolver_impl.h"

@@ -24,7 +25,6 @@

#include "net/proxy/proxy_resolver.h"

#include "net/proxy/proxy_resolver_error_observer.h"

#include "net/proxy/proxy_resolver_script_data.h"

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

namespace net {

namespace {

« no previous file with comments | « net/proxy/proxy_resolver_factory_mojo.h ('k') | net/proxy/proxy_resolver_factory_mojo_unittest.cc » ('j') | no next file with comments »