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

Side by Side Diff: chrome/browser/history/history_service_factory.cc

Issue 305443004: Introduce HistoryClient interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@371825
Patch Set: Reupload with --no-find-copies Created 6 years, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/history/history_service_factory.h" 5 #include "chrome/browser/history/history_service_factory.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
9 #include "chrome/browser/history/chrome_history_client.h"
10 #include "chrome/browser/history/chrome_history_client_factory.h"
9 #include "chrome/browser/history/history_service.h" 11 #include "chrome/browser/history/history_service.h"
10 #include "chrome/browser/profiles/incognito_helpers.h" 12 #include "chrome/browser/profiles/incognito_helpers.h"
11 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
12 #include "components/bookmarks/browser/bookmark_model.h" 14 #include "components/bookmarks/browser/bookmark_model.h"
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" 15 #include "components/keyed_service/content/browser_context_dependency_manager.h"
14 16
15 // static 17 // static
16 HistoryService* HistoryServiceFactory::GetForProfile( 18 HistoryService* HistoryServiceFactory::GetForProfile(
17 Profile* profile, Profile::ServiceAccessType sat) { 19 Profile* profile, Profile::ServiceAccessType sat) {
18 // If saving history is disabled, only allow explicit access. 20 // If saving history is disabled, only allow explicit access.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // static 54 // static
53 void HistoryServiceFactory::ShutdownForProfile(Profile* profile) { 55 void HistoryServiceFactory::ShutdownForProfile(Profile* profile) {
54 HistoryServiceFactory* factory = GetInstance(); 56 HistoryServiceFactory* factory = GetInstance();
55 factory->BrowserContextDestroyed(profile); 57 factory->BrowserContextDestroyed(profile);
56 } 58 }
57 59
58 HistoryServiceFactory::HistoryServiceFactory() 60 HistoryServiceFactory::HistoryServiceFactory()
59 : BrowserContextKeyedServiceFactory( 61 : BrowserContextKeyedServiceFactory(
60 "HistoryService", BrowserContextDependencyManager::GetInstance()) { 62 "HistoryService", BrowserContextDependencyManager::GetInstance()) {
61 DependsOn(BookmarkModelFactory::GetInstance()); 63 DependsOn(BookmarkModelFactory::GetInstance());
64 DependsOn(ChromeHistoryClientFactory::GetInstance());
62 } 65 }
63 66
64 HistoryServiceFactory::~HistoryServiceFactory() { 67 HistoryServiceFactory::~HistoryServiceFactory() {
65 } 68 }
66 69
67 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor( 70 KeyedService* HistoryServiceFactory::BuildServiceInstanceFor(
68 content::BrowserContext* context) const { 71 content::BrowserContext* context) const {
69 Profile* profile = static_cast<Profile*>(context); 72 Profile* profile = static_cast<Profile*>(context);
70 HistoryService* history_service = new HistoryService(profile); 73 HistoryService* history_service = new HistoryService(
74 ChromeHistoryClientFactory::GetForProfile(profile), profile);
71 if (!history_service->Init(profile->GetPath(), 75 if (!history_service->Init(profile->GetPath(),
72 BookmarkModelFactory::GetForProfile(profile))) { 76 BookmarkModelFactory::GetForProfile(profile))) {
73 return NULL; 77 return NULL;
74 } 78 }
75 return history_service; 79 return history_service;
76 } 80 }
77 81
78 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse( 82 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse(
79 content::BrowserContext* context) const { 83 content::BrowserContext* context) const {
80 return chrome::GetBrowserContextRedirectedInIncognito(context); 84 return chrome::GetBrowserContextRedirectedInIncognito(context);
81 } 85 }
82 86
83 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const { 87 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const {
84 return true; 88 return true;
85 } 89 }
OLDNEW
« no previous file with comments | « chrome/browser/history/history_service.cc ('k') | chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698