chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc - Issue 12518036: net: move host_resolver files from net/base to net/dns

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: chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_apitest.cc ('k') | chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc » ('j') | webkit/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc

diff --git a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc

index 3209c7a9bee54a3bba932125e29dc3db06edb109..237941cc0c3065b9ad9f250f4bae48a174b43163 100644

--- a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc

+++ b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc

@@ -20,7 +20,7 @@

#include "net/base/net_errors.h"

#include "net/base/net_log.h"

#include "net/base/net_util.h"

-#include "net/base/single_request_host_resolver.h"

+#include "net/dns/single_request_host_resolver.h"

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/web_socket_proxy_controller.h"