chrome/browser/history/history_database.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_database.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/history_database.h ('k') | chrome/browser/history/history_service.cc » ('j') | components/history/content/browser/download_constants_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/history_database.cc

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

index a0786eb7bec4a4053d67e8012a49da4ed3a4e6d2..e35fded9411180947641c56a4b3e10a8637ecfe6 100644

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

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

@@ -14,6 +14,7 @@

#include "base/rand_util.h"

#include "base/strings/string_util.h"

#include "base/time/time.h"

+#include "content/public/browser/download_interrupt_reasons.h"

#include "sql/transaction.h"

#if defined(OS_MACOSX)

@@ -33,7 +34,11 @@ const char kEarlyExpirationThresholdKey[] = "early_expiration_threshold";

} // namespace

-HistoryDatabase::HistoryDatabase() {

+HistoryDatabase::HistoryDatabase()

+ : DownloadDatabase(static_cast<DownloadInterruptReason>(

droger 2015/01/06 10:22:18 Can we use ToHistoryDownloadInterruptReason() here

sdefresne 2015/01/06 10:51:17 Good catch.

+ content::DOWNLOAD_INTERRUPT_REASON_NONE),

+ static_cast<DownloadInterruptReason>(

+ content::DOWNLOAD_INTERRUPT_REASON_CRASH)) {

}

HistoryDatabase::~HistoryDatabase() {