Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5778)

Unified Diff: chromecast/browser/cast_browser_process.cc

Issue 2647323010: [Chromecast] Add proxy server support to chromecast (Closed)
Patch Set: Update connectivity checker to make it compile on desktop Created 3 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:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/browser/cast_browser_process.cc
diff --git a/chromecast/browser/cast_browser_process.cc b/chromecast/browser/cast_browser_process.cc
index cf7101aab315a05cd2c52005d003c15de9ff24af..97cea0c92312474dbdbac306440340477fd52c8d 100644
--- a/chromecast/browser/cast_browser_process.cc
+++ b/chromecast/browser/cast_browser_process.cc
@@ -4,8 +4,10 @@
#include "chromecast/browser/cast_browser_process.h"
+#include <string>
wzhong 2017/01/27 23:37:17 Needed? Or lint complains?
almasrymina 2017/02/06 22:38:34 Done.
#include <utility>
+#include "base/command_line.h"
#include "base/logging.h"
#include "build/build_config.h"
#include "chromecast/base/metrics/cast_metrics_helper.h"
@@ -16,6 +18,11 @@
#include "chromecast/net/connectivity_checker.h"
#include "chromecast/service/cast_service.h"
#include "components/prefs/pref_service.h"
+#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
+#include "components/proxy_config/proxy_config_dictionary.h"
+#include "components/proxy_config/proxy_config_pref_names.h"
wzhong 2017/01/27 23:37:17 Do we need so many header file for adding just a c
almasrymina 2017/02/06 22:38:34 Done.
+#include "content/public/browser/browser_thread.h"
+#include "net/proxy/proxy_config.h"
#if defined(OS_ANDROID)
#include "components/crash/content/browser/crash_dump_manager_android.h"
@@ -42,6 +49,7 @@ CastBrowserProcess::CastBrowserProcess()
: cast_content_browser_client_(nullptr),
net_log_(nullptr) {
DCHECK(!g_instance);
+
g_instance = this;
}
@@ -94,6 +102,10 @@ void CastBrowserProcess::SetPrefService(
std::unique_ptr<PrefService> pref_service) {
DCHECK(!pref_service_);
pref_service_.swap(pref_service);
+
+ pref_proxy_config_tracker_.reset(new PrefProxyConfigTrackerImpl(
+ pref_service_.get(), content::BrowserThread::GetTaskRunnerForThread(
+ content::BrowserThread::IO)));
}
void CastBrowserProcess::SetRemoteDebuggingServer(

Powered by Google App Engine
This is Rietveld 408576698