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

Unified 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: " Created 9 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 31a9e1aba971abb34018b75e15a06a566e786500..a9d0d81b7014742020eb22dadd38c98d0893aa5b 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -191,6 +191,8 @@ void ProfileIOData::InitializeProfileParams(Profile* profile) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
PrefService* pref_service = profile->GetPrefs();
+ next_download_id_thunk_ = profile->GetDownloadManager()->GetNextIdThunk();
+
scoped_ptr<ProfileParams> params(new ProfileParams);
params->is_incognito = profile->IsOffTheRecord();
params->clear_local_state_on_exit =
@@ -485,6 +487,15 @@ void ProfileIOData::LazyInitialize() const {
resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this));
resource_context_.set_media_observer(
io_thread_globals->media.media_internals.get());
+ // TODO(benjhayden) clean this up when we can include DownloadManager in
+ // ResourceContext.
+ 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.
+#if defined(COMPILER_GCC)
+ hash<std::string>()
+#elif defined(COMPILER_MSVC)
+ hash_value
+#endif
+ ("next_download_id_thunk")), &next_download_id_thunk_);
LazyInitializeInternal(profile_params_.get());

Powered by Google App Engine
This is Rietveld 408576698