Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 7237034: sql::MetaTable.next_download_id, DownloadManager::GetNextId() (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix merge Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "content/common/notification_service.h" 47 #include "content/common/notification_service.h"
48 #include "net/base/origin_bound_cert_service.h" 48 #include "net/base/origin_bound_cert_service.h"
49 #include "net/http/http_transaction_factory.h" 49 #include "net/http/http_transaction_factory.h"
50 #include "net/http/http_util.h" 50 #include "net/http/http_util.h"
51 #include "net/proxy/proxy_config_service_fixed.h" 51 #include "net/proxy/proxy_config_service_fixed.h"
52 #include "net/proxy/proxy_script_fetcher_impl.h" 52 #include "net/proxy/proxy_script_fetcher_impl.h"
53 #include "net/proxy/proxy_service.h" 53 #include "net/proxy/proxy_service.h"
54 #include "net/url_request/url_request.h" 54 #include "net/url_request/url_request.h"
55 #include "webkit/blob/blob_data.h" 55 #include "webkit/blob/blob_data.h"
56 #include "webkit/blob/blob_url_request_job_factory.h" 56 #include "webkit/blob/blob_url_request_job_factory.h"
57 #include "webkit/database/database_tracker.h"
57 #include "webkit/fileapi/file_system_context.h" 58 #include "webkit/fileapi/file_system_context.h"
58 #include "webkit/fileapi/file_system_url_request_job_factory.h" 59 #include "webkit/fileapi/file_system_url_request_job_factory.h"
59 #include "webkit/database/database_tracker.h"
60 #include "webkit/quota/quota_manager.h" 60 #include "webkit/quota/quota_manager.h"
61 61
62 #if defined(OS_CHROMEOS) 62 #if defined(OS_CHROMEOS)
63 #include "chrome/browser/chromeos/gview_request_interceptor.h" 63 #include "chrome/browser/chromeos/gview_request_interceptor.h"
64 #endif // defined(OS_CHROMEOS) 64 #endif // defined(OS_CHROMEOS)
65 65
66 namespace { 66 namespace {
67 67
68 // ---------------------------------------------------------------------------- 68 // ----------------------------------------------------------------------------
69 // CookieMonster::Delegate implementation 69 // CookieMonster::Delegate implementation
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 return profile->GetPrerenderManager(); 185 return profile->GetPrerenderManager();
186 return NULL; 186 return NULL;
187 } 187 }
188 188
189 } // namespace 189 } // namespace
190 190
191 void ProfileIOData::InitializeProfileParams(Profile* profile) { 191 void ProfileIOData::InitializeProfileParams(Profile* profile) {
192 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 192 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
193 PrefService* pref_service = profile->GetPrefs(); 193 PrefService* pref_service = profile->GetPrefs();
194 194
195 next_download_id_thunk_ = profile->GetDownloadManager()->GetNextIdThunk();
196
195 scoped_ptr<ProfileParams> params(new ProfileParams); 197 scoped_ptr<ProfileParams> params(new ProfileParams);
196 params->is_incognito = profile->IsOffTheRecord(); 198 params->is_incognito = profile->IsOffTheRecord();
197 params->clear_local_state_on_exit = 199 params->clear_local_state_on_exit =
198 pref_service->GetBoolean(prefs::kClearSiteDataOnExit); 200 pref_service->GetBoolean(prefs::kClearSiteDataOnExit);
199 201
200 params->appcache_service = profile->GetAppCacheService(); 202 params->appcache_service = profile->GetAppCacheService();
201 203
202 // Set up Accept-Language and Accept-Charset header values 204 // Set up Accept-Language and Accept-Charset header values
203 params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader( 205 params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader(
204 pref_service->GetString(prefs::kAcceptLanguages)); 206 pref_service->GetString(prefs::kAcceptLanguages));
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 resource_context_.set_database_tracker(database_tracker_); 481 resource_context_.set_database_tracker(database_tracker_);
480 resource_context_.set_appcache_service(appcache_service_); 482 resource_context_.set_appcache_service(appcache_service_);
481 resource_context_.set_blob_storage_context(blob_storage_context_); 483 resource_context_.set_blob_storage_context(blob_storage_context_);
482 resource_context_.set_file_system_context(file_system_context_); 484 resource_context_.set_file_system_context(file_system_context_);
483 resource_context_.set_quota_manager(quota_manager_); 485 resource_context_.set_quota_manager(quota_manager_);
484 resource_context_.set_host_zoom_map(host_zoom_map_); 486 resource_context_.set_host_zoom_map(host_zoom_map_);
485 resource_context_.set_prerender_manager_getter(prerender_manager_getter_); 487 resource_context_.set_prerender_manager_getter(prerender_manager_getter_);
486 resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this)); 488 resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this));
487 resource_context_.set_media_observer( 489 resource_context_.set_media_observer(
488 io_thread_globals->media.media_internals.get()); 490 io_thread_globals->media.media_internals.get());
491 resource_context_.set_next_download_id_thunk(next_download_id_thunk_);
489 492
490 LazyInitializeInternal(profile_params_.get()); 493 LazyInitializeInternal(profile_params_.get());
491 494
492 profile_params_.reset(); 495 profile_params_.reset();
493 initialized_ = true; 496 initialized_ = true;
494 } 497 }
495 498
496 void ProfileIOData::ApplyProfileParamsToContext( 499 void ProfileIOData::ApplyProfileParamsToContext(
497 ChromeURLRequestContext* context) const { 500 ChromeURLRequestContext* context) const {
498 context->set_is_incognito(profile_params_->is_incognito); 501 context->set_is_incognito(profile_params_->is_incognito);
(...skipping 19 matching lines...) Expand all
518 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, 521 bool posted = BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
519 new DeleteTask<ProfileIOData>(this)); 522 new DeleteTask<ProfileIOData>(this));
520 if (!posted) 523 if (!posted)
521 delete this; 524 delete this;
522 } 525 }
523 526
524 void ProfileIOData::set_origin_bound_cert_service( 527 void ProfileIOData::set_origin_bound_cert_service(
525 net::OriginBoundCertService* origin_bound_cert_service) const { 528 net::OriginBoundCertService* origin_bound_cert_service) const {
526 origin_bound_cert_service_.reset(origin_bound_cert_service); 529 origin_bound_cert_service_.reset(origin_bound_cert_service);
527 } 530 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | content/browser/download/download_file_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698