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