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/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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 params->path = profile->GetPath(); | 198 params->path = profile->GetPath(); |
199 params->is_incognito = profile->IsOffTheRecord(); | 199 params->is_incognito = profile->IsOffTheRecord(); |
200 params->clear_local_state_on_exit = | 200 params->clear_local_state_on_exit = |
201 pref_service->GetBoolean(prefs::kClearSiteDataOnExit); | 201 pref_service->GetBoolean(prefs::kClearSiteDataOnExit); |
202 | 202 |
203 params->appcache_service = profile->GetAppCacheService(); | 203 params->appcache_service = profile->GetAppCacheService(); |
204 | 204 |
205 // Set up Accept-Language and Accept-Charset header values | 205 // Set up Accept-Language and Accept-Charset header values |
206 params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader( | 206 params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader( |
207 pref_service->GetString(prefs::kAcceptLanguages)); | 207 pref_service->GetString(prefs::kAcceptLanguages)); |
208 std::string default_charset = pref_service->GetString(prefs::kDefaultCharset); | 208 std::string default_charset = |
| 209 pref_service->GetString(prefs::kGlobalDefaultCharset); |
209 params->accept_charset = | 210 params->accept_charset = |
210 net::HttpUtil::GenerateAcceptCharsetHeader(default_charset); | 211 net::HttpUtil::GenerateAcceptCharsetHeader(default_charset); |
211 | 212 |
212 // At this point, we don't know the charset of the referring page | 213 // At this point, we don't know the charset of the referring page |
213 // where a url request originates from. This is used to get a suggested | 214 // where a url request originates from. This is used to get a suggested |
214 // filename from Content-Disposition header made of raw 8bit characters. | 215 // filename from Content-Disposition header made of raw 8bit characters. |
215 // Down the road, it can be overriden if it becomes known (for instance, | 216 // Down the road, it can be overriden if it becomes known (for instance, |
216 // when download request is made through the context menu in a web page). | 217 // when download request is made through the context menu in a web page). |
217 // At the moment, it'll remain 'undeterministic' when a user | 218 // At the moment, it'll remain 'undeterministic' when a user |
218 // types a URL in the omnibar or click on a download link in a page. | 219 // types a URL in the omnibar or click on a download link in a page. |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 562 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
562 new DeleteTask<ProfileIOData>(this)); | 563 new DeleteTask<ProfileIOData>(this)); |
563 if (!posted) | 564 if (!posted) |
564 delete this; | 565 delete this; |
565 } | 566 } |
566 | 567 |
567 void ProfileIOData::set_origin_bound_cert_service( | 568 void ProfileIOData::set_origin_bound_cert_service( |
568 net::OriginBoundCertService* origin_bound_cert_service) const { | 569 net::OriginBoundCertService* origin_bound_cert_service) const { |
569 origin_bound_cert_service_.reset(origin_bound_cert_service); | 570 origin_bound_cert_service_.reset(origin_bound_cert_service); |
570 } | 571 } |
OLD | NEW |