chrome/browser/profiles/off_the_record_profile_impl.cc - Issue 1296663003: Componentize proxy code from chrome/browser/net

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/profiles/off_the_record_profile_impl.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updating for win p/f Created 5 years, 4 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: chrome/browser/profiles/off_the_record_profile_impl.cc

diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc

index de1513c66a512513269bb1ebb773e8d859101c26..c2f4863d68b3ab677937c830a014c12f57864c25 100644

--- a/chrome/browser/profiles/off_the_record_profile_impl.cc

+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc

@@ -21,7 +21,6 @@

#include "chrome/browser/download/download_service_factory.h"

#include "chrome/browser/io_thread.h"

#include "chrome/browser/net/chrome_url_request_context_getter.h"

-#include "chrome/browser/net/pref_proxy_config_tracker.h"

#include "chrome/browser/net/proxy_service_factory.h"

#include "chrome/browser/permissions/permission_manager.h"

#include "chrome/browser/permissions/permission_manager_factory.h"

@@ -38,9 +37,9 @@

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

-#include "chrome/common/pref_names.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "components/keyed_service/content/browser_context_dependency_manager.h"

+#include "components/proxy_config/pref_proxy_config_tracker.h"

#include "components/ui/zoom/zoom_event_manager.h"

#include "components/user_prefs/user_prefs.h"

#include "content/public/browser/browser_thread.h"