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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 6549007: Make CrOS proxy configuration write prefs directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix single proxy handling for real! Created 9 years, 10 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: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 224ef1e09fbd24111da623b1100c5e3b2a7c60b8..8f2a81557933efac4314aaa280c2115b27a2483a 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -32,7 +32,6 @@
#include "chrome/browser/chromeos/login/parallel_authenticator.h"
#include "chrome/browser/chromeos/login/user_image_downloader.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/proxy_config_service.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/net/gaia/token_service.h"
@@ -239,6 +238,7 @@ void LoginUtilsImpl::CompleteLogin(
}
btl->AddLoginTimeMarker("UserProfileGotten", false);
+#if 0
danno 2011/02/21 21:45:20 I assume this is because the CL is still a work in
Mattias Nissler (ping if slow) 2011/02/22 09:45:34 Ah, yes. I think I should remove this block. This
// Change the proxy configuration service of the default request context to
// use the preference configuration from the logged-in profile. This ensures
// that requests done through the default context use the proxy configuration
@@ -260,6 +260,7 @@ void LoginUtilsImpl::CompleteLogin(
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
new ResetDefaultProxyConfigServiceTask(
proxy_config_service));
+#endif
// Since we're doing parallel authentication, only new user sign in
// would perform online auth before calling CompleteLogin.
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service.h » ('j') | chrome/browser/chromeos/proxy_config_service_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698