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

Unified Diff: chrome/browser/history/history_service.h

Issue 870143004: HistoryService::Init() receives the list of languages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@web-history-service
Patch Set: 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
« no previous file with comments | « chrome/browser/history/history_querying_unittest.cc ('k') | chrome/browser/history/history_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_service.h
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 34f3dbf98b05c3f77b87b7d6a765c676a8ad0e73..5ac9e246df164402e80fb2691b7a04a09f9eaab7 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -42,6 +42,7 @@ class AndroidHistoryProviderService;
class GURL;
class PageUsageData;
class PageUsageRequest;
+class PrefService;
class Profile;
struct ImportedFaviconUsage;
class SkBitmap;
@@ -100,8 +101,9 @@ class HistoryService : public syncer::SyncableService,
// Initializes the history service, returning true on success. On false, do
// not call any other functions. The given directory will be used for storing
// the history files.
- bool Init(const history::HistoryDatabaseParams& history_database_params) {
- return Init(false, history_database_params);
+ bool Init(PrefService* prefs,
+ const history::HistoryDatabaseParams& history_database_params) {
+ return Init(false, prefs, history_database_params);
}
// Triggers the backend to load if it hasn't already, and then returns whether
@@ -562,6 +564,7 @@ class HistoryService : public syncer::SyncableService,
// Low-level Init(). Same as the public version, but adds a |no_db| parameter
// that is only set by unittests which causes the backend to not init its DB.
bool Init(bool no_db,
+ PrefService* prefs,
const history::HistoryDatabaseParams& history_database_params);
// Called by the HistoryURLProvider class to schedule an autocomplete, it
@@ -813,9 +816,6 @@ class HistoryService : public syncer::SyncableService,
// outlive |HistoryService|.
history::HistoryClient* history_client_;
- // The profile, may be null when testing.
- Profile* profile_;
-
// Used for propagating link highlighting data across renderers. May be null
// in tests.
scoped_ptr<visitedlink::VisitedLinkMaster> visitedlink_master_;
« no previous file with comments | « chrome/browser/history/history_querying_unittest.cc ('k') | chrome/browser/history/history_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698