Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 577 | 577 |
| 578 LazyInitializeInternal(profile_params_.get()); | 578 LazyInitializeInternal(profile_params_.get()); |
| 579 | 579 |
| 580 profile_params_.reset(); | 580 profile_params_.reset(); |
| 581 initialized_ = true; | 581 initialized_ = true; |
| 582 } | 582 } |
| 583 | 583 |
| 584 void ProfileIOData::ApplyProfileParamsToContext( | 584 void ProfileIOData::ApplyProfileParamsToContext( |
| 585 ChromeURLRequestContext* context) const { | 585 ChromeURLRequestContext* context) const { |
| 586 context->set_is_incognito(is_incognito()); | 586 context->set_is_incognito(is_incognito()); |
| 587 context->set_accept_language(profile_params_->accept_language); | 587 context->OnAcceptLanguageChange(profile_params_->accept_language); |
|
erikwright (departed)
2012/09/25 21:06:38
Is there actually any compelling reason for these
pauljensen
2012/09/26 14:08:19
They come from the prefs so I believe they must be
| |
| 588 context->set_accept_charset(profile_params_->accept_charset); | 588 context->OnDefaultCharsetChange(profile_params_->accept_charset); |
| 589 context->set_referrer_charset(profile_params_->referrer_charset); | 589 context->set_referrer_charset(profile_params_->referrer_charset); |
| 590 context->set_ssl_config_service(profile_params_->ssl_config_service); | 590 context->set_ssl_config_service(profile_params_->ssl_config_service); |
| 591 } | 591 } |
| 592 | 592 |
| 593 void ProfileIOData::SetUpJobFactoryDefaults( | 593 void ProfileIOData::SetUpJobFactoryDefaults( |
| 594 net::URLRequestJobFactory* job_factory) const { | 594 net::URLRequestJobFactory* job_factory) const { |
| 595 // NOTE(willchan): Keep these protocol handlers in sync with | 595 // NOTE(willchan): Keep these protocol handlers in sync with |
| 596 // ProfileIOData::IsHandledProtocol(). | 596 // ProfileIOData::IsHandledProtocol(). |
| 597 | 597 |
| 598 if (profile_params_->protocol_handler_url_interceptor.get()) { | 598 if (profile_params_->protocol_handler_url_interceptor.get()) { |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 686 params->http_pipelining_enabled = globals->http_pipelining_enabled; | 686 params->http_pipelining_enabled = globals->http_pipelining_enabled; |
| 687 params->testing_fixed_http_port = globals->testing_fixed_http_port; | 687 params->testing_fixed_http_port = globals->testing_fixed_http_port; |
| 688 params->testing_fixed_https_port = globals->testing_fixed_https_port; | 688 params->testing_fixed_https_port = globals->testing_fixed_https_port; |
| 689 | 689 |
| 690 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 690 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 691 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { | 691 if (command_line.HasSwitch(switches::kTrustedSpdyProxy)) { |
| 692 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( | 692 params->trusted_spdy_proxy = command_line.GetSwitchValueASCII( |
| 693 switches::kTrustedSpdyProxy); | 693 switches::kTrustedSpdyProxy); |
| 694 } | 694 } |
| 695 } | 695 } |
| OLD | NEW |