net/proxy/mojo_proxy_type_converters.h - 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/mojo_proxy_type_converters.h

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/mojo_proxy_type_converters.h

diff --git a/net/proxy/mojo_proxy_type_converters.h b/net/proxy/mojo_proxy_type_converters.h

index 55ea69df919e6aa99ece5918c74d8bb6ed8ab585..51b0e380c666a711190bc912ab71959f07dcde9d 100644

--- a/net/proxy/mojo_proxy_type_converters.h

+++ b/net/proxy/mojo_proxy_type_converters.h

@@ -5,8 +5,8 @@

#ifndef NET_PROXY_MOJO_PROXY_TYPE_CONVERTERS_H_

#define NET_PROXY_MOJO_PROXY_TYPE_CONVERTERS_H_

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

#include "net/interfaces/proxy_resolver_service.mojom.h"

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

namespace net {

class ProxyInfo;

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