chrome/browser/history/history_backend.cc - Issue 833033002: Remove dependency on //content from history DownloadDatabase

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/history_backend.cc

Issue 833033002: Remove dependency on //content from history DownloadDatabase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing conversion Created 5 years, 11 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

« chrome/browser/history/download_database.cc ('K') | « chrome/browser/history/download_row.cc ('k') | chrome/browser/history/history_database.h » ('j') | chrome/browser/history/history_database.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/history_backend.cc

diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc

index 5e3917805960281aae367eb4c9dc4496dc2d591f..3320d5b8c317c41224e4ca402d5cb74b2371df0b 100644

--- a/chrome/browser/history/history_backend.cc

+++ b/chrome/browser/history/history_backend.cc

@@ -24,7 +24,6 @@

#include "base/strings/utf_string_conversions.h"

#include "base/time/time.h"

#include "chrome/browser/chrome_notification_types.h"

-#include "chrome/browser/history/download_row.h"

#include "chrome/browser/history/history_notifications.h"

#include "chrome/browser/history/in_memory_history_backend.h"

@@ -35,6 +34,8 @@

#include "chrome/common/importer/imported_favicon_usage.h"

#include "chrome/common/url_constants.h"

#include "components/favicon_base/select_favicon_frames.h"

+#include "components/history/core/browser/download_constants.h"

+#include "components/history/core/browser/download_row.h"

#include "components/history/core/browser/history_backend_observer.h"

#include "components/history/core/browser/history_client.h"

#include "components/history/core/browser/history_constants.h"

@@ -1112,7 +1113,7 @@ void HistoryBackend::RemoveObserver(HistoryBackendObserver* observer) {

// Downloads -------------------------------------------------------------------

uint32 HistoryBackend::GetNextDownloadId() {

- return db_ ? db_->GetNextDownloadId() : content::DownloadItem::kInvalidId;

+ return db_ ? db_->GetNextDownloadId() : kInvalidDownloadId;

}

// Get all the download entries from the database.