| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 // This includes preconnect, autofill, metrics service to only name a few; | 252 // This includes preconnect, autofill, metrics service to only name a few; |
| 253 // see http://code.google.com/p/chromium/issues/detail?id=64339 for details. | 253 // see http://code.google.com/p/chromium/issues/detail?id=64339 for details. |
| 254 // | 254 // |
| 255 // TODO(mnissler) Revisit when support for device-specific policy arrives, at | 255 // TODO(mnissler) Revisit when support for device-specific policy arrives, at |
| 256 // which point the default request context can directly be managed through | 256 // which point the default request context can directly be managed through |
| 257 // device policy. | 257 // device policy. |
| 258 net::ProxyConfigService* proxy_config_service = | 258 net::ProxyConfigService* proxy_config_service = |
| 259 new PrefProxyConfigService( | 259 new PrefProxyConfigService( |
| 260 profile->GetProxyConfigTracker(), | 260 profile->GetProxyConfigTracker(), |
| 261 new chromeos::ProxyConfigService( | 261 new chromeos::ProxyConfigService( |
| 262 profile->GetChromeOSProxyConfigServiceImpl())); | 262 g_browser_process->chromeos_proxy_config_service_impl())); |
| 263 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 263 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
| 264 new ResetDefaultProxyConfigServiceTask( | 264 new ResetDefaultProxyConfigServiceTask( |
| 265 proxy_config_service)); | 265 proxy_config_service)); |
| 266 | 266 |
| 267 // Since we're doing parallel authentication, only new user sign in | 267 // Since we're doing parallel authentication, only new user sign in |
| 268 // would perform online auth before calling CompleteLogin. | 268 // would perform online auth before calling CompleteLogin. |
| 269 // For existing users there's usually a pending online auth request. | 269 // For existing users there's usually a pending online auth request. |
| 270 // Cookies will be fetched after it's is succeeded. | 270 // Cookies will be fetched after it's is succeeded. |
| 271 if (!pending_requests) { | 271 if (!pending_requests) { |
| 272 FetchCookies(profile, credentials); | 272 FetchCookies(profile, credentials); |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 BrowserInit browser_init; | 585 BrowserInit browser_init; |
| 586 int return_code; | 586 int return_code; |
| 587 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), | 587 browser_init.LaunchBrowser(*CommandLine::ForCurrentProcess(), |
| 588 profile, | 588 profile, |
| 589 FilePath(), | 589 FilePath(), |
| 590 true, | 590 true, |
| 591 &return_code); | 591 &return_code); |
| 592 } | 592 } |
| 593 | 593 |
| 594 } // namespace chromeos | 594 } // namespace chromeos |
| OLD | NEW |