Chromium Code Reviews| 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 184 return profile->GetPrerenderManager(); | 184 return profile->GetPrerenderManager(); |
| 185 return NULL; | 185 return NULL; |
| 186 } | 186 } |
| 187 | 187 |
| 188 } // namespace | 188 } // namespace |
| 189 | 189 |
| 190 void ProfileIOData::InitializeProfileParams(Profile* profile) { | 190 void ProfileIOData::InitializeProfileParams(Profile* profile) { |
| 191 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 191 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 192 PrefService* pref_service = profile->GetPrefs(); | 192 PrefService* pref_service = profile->GetPrefs(); |
| 193 | 193 |
| 194 next_download_id_thunk_ = profile->GetDownloadManager()->GetNextIdThunk(); | |
| 195 | |
| 194 scoped_ptr<ProfileParams> params(new ProfileParams); | 196 scoped_ptr<ProfileParams> params(new ProfileParams); |
| 195 params->is_incognito = profile->IsOffTheRecord(); | 197 params->is_incognito = profile->IsOffTheRecord(); |
| 196 params->clear_local_state_on_exit = | 198 params->clear_local_state_on_exit = |
| 197 pref_service->GetBoolean(prefs::kClearSiteDataOnExit); | 199 pref_service->GetBoolean(prefs::kClearSiteDataOnExit); |
| 198 | 200 |
| 199 params->appcache_service = profile->GetAppCacheService(); | 201 params->appcache_service = profile->GetAppCacheService(); |
| 200 | 202 |
| 201 // Set up Accept-Language and Accept-Charset header values | 203 // Set up Accept-Language and Accept-Charset header values |
| 202 params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader( | 204 params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader( |
| 203 pref_service->GetString(prefs::kAcceptLanguages)); | 205 pref_service->GetString(prefs::kAcceptLanguages)); |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 478 resource_context_.set_database_tracker(database_tracker_); | 480 resource_context_.set_database_tracker(database_tracker_); |
| 479 resource_context_.set_appcache_service(appcache_service_); | 481 resource_context_.set_appcache_service(appcache_service_); |
| 480 resource_context_.set_blob_storage_context(blob_storage_context_); | 482 resource_context_.set_blob_storage_context(blob_storage_context_); |
| 481 resource_context_.set_file_system_context(file_system_context_); | 483 resource_context_.set_file_system_context(file_system_context_); |
| 482 resource_context_.set_quota_manager(quota_manager_); | 484 resource_context_.set_quota_manager(quota_manager_); |
| 483 resource_context_.set_host_zoom_map(host_zoom_map_); | 485 resource_context_.set_host_zoom_map(host_zoom_map_); |
| 484 resource_context_.set_prerender_manager_getter(prerender_manager_getter_); | 486 resource_context_.set_prerender_manager_getter(prerender_manager_getter_); |
| 485 resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this)); | 487 resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this)); |
| 486 resource_context_.set_media_observer( | 488 resource_context_.set_media_observer( |
| 487 io_thread_globals->media.media_internals.get()); | 489 io_thread_globals->media.media_internals.get()); |
| 490 // TODO(benjhayden) clean this up when we can include DownloadManager in | |
| 491 // ResourceContext. | |
| 492 resource_context_.SetUserData(reinterpret_cast<void*>(BASE_HASH_NAMESPACE:: | |
|
willchan no longer on Chromium
2011/08/06 14:08:36
Don't use SetUserData() for this. Create a new set
benjhayden
2011/08/08 16:50:19
Sorry, are you suggesting having content/browser/r
willchan no longer on Chromium
2011/08/10 01:24:20
I'm suggesting including the necessary header.
I'
benjhayden
2011/08/16 19:54:15
Done.
| |
| 493 #if defined(COMPILER_GCC) | |
| 494 hash<std::string>() | |
| 495 #elif defined(COMPILER_MSVC) | |
| 496 hash_value | |
| 497 #endif | |
| 498 ("next_download_id_thunk")), &next_download_id_thunk_); | |
| 488 | 499 |
| 489 LazyInitializeInternal(profile_params_.get()); | 500 LazyInitializeInternal(profile_params_.get()); |
| 490 | 501 |
| 491 profile_params_.reset(); | 502 profile_params_.reset(); |
| 492 initialized_ = true; | 503 initialized_ = true; |
| 493 } | 504 } |
| 494 | 505 |
| 495 void ProfileIOData::ApplyProfileParamsToContext( | 506 void ProfileIOData::ApplyProfileParamsToContext( |
| 496 ChromeURLRequestContext* context) const { | 507 ChromeURLRequestContext* context) const { |
| 497 context->set_is_incognito(profile_params_->is_incognito); | 508 context->set_is_incognito(profile_params_->is_incognito); |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 512 BrowserThread::IO, FROM_HERE, | 523 BrowserThread::IO, FROM_HERE, |
| 513 base::Bind( | 524 base::Bind( |
| 514 &ResourceDispatcherHost::CancelRequestsForContext, | 525 &ResourceDispatcherHost::CancelRequestsForContext, |
| 515 base::Unretained(g_browser_process->resource_dispatcher_host()), | 526 base::Unretained(g_browser_process->resource_dispatcher_host()), |
| 516 &resource_context_)); | 527 &resource_context_)); |
| 517 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 528 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
| 518 new DeleteTask<ProfileIOData>(this)); | 529 new DeleteTask<ProfileIOData>(this)); |
| 519 if (!posted) | 530 if (!posted) |
| 520 delete this; | 531 delete this; |
| 521 } | 532 } |
| OLD | NEW |