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

Side by Side Diff: trunk/src/chrome/browser/prerender/prerender_manager_factory.cc

Issue 13995007: Revert 194484 "Add the LoggedIn Predictor, to detect which websi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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/prerender/prerender_manager_factory.h" 5 #include "chrome/browser/prerender/prerender_manager_factory.h"
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/extensions/extension_system_factory.h" 8 #include "chrome/browser/extensions/extension_system_factory.h"
9 #include "chrome/browser/history/history_service_factory.h" 9 #include "chrome/browser/history/history_service_factory.h"
10 #include "chrome/browser/predictors/predictor_database_factory.h"
11 #include "chrome/browser/prerender/prerender_manager.h" 10 #include "chrome/browser/prerender/prerender_manager.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_dependency_manager.h" 12 #include "chrome/browser/profiles/profile_dependency_manager.h"
14 13
15 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
16 #include "chrome/browser/chromeos/cros/cros_library.h" 15 #include "chrome/browser/chromeos/cros/cros_library.h"
17 #include "chrome/browser/chromeos/prerender_condition_network.h" 16 #include "chrome/browser/chromeos/prerender_condition_network.h"
18 #endif 17 #endif
19 18
20 namespace prerender { 19 namespace prerender {
(...skipping 11 matching lines...) Expand all
32 PrerenderManagerFactory* PrerenderManagerFactory::GetInstance() { 31 PrerenderManagerFactory* PrerenderManagerFactory::GetInstance() {
33 return Singleton<PrerenderManagerFactory>::get(); 32 return Singleton<PrerenderManagerFactory>::get();
34 } 33 }
35 34
36 PrerenderManagerFactory::PrerenderManagerFactory() 35 PrerenderManagerFactory::PrerenderManagerFactory()
37 : ProfileKeyedServiceFactory("PrerenderManager", 36 : ProfileKeyedServiceFactory("PrerenderManager",
38 ProfileDependencyManager::GetInstance()) { 37 ProfileDependencyManager::GetInstance()) {
39 DependsOn(extensions::ExtensionSystemFactory::GetInstance()); 38 DependsOn(extensions::ExtensionSystemFactory::GetInstance());
40 // PrerenderLocalPredictor observers the history visit DB. 39 // PrerenderLocalPredictor observers the history visit DB.
41 DependsOn(HistoryServiceFactory::GetInstance()); 40 DependsOn(HistoryServiceFactory::GetInstance());
42 DependsOn(predictors::PredictorDatabaseFactory::GetInstance());
43 } 41 }
44 42
45 PrerenderManagerFactory::~PrerenderManagerFactory() { 43 PrerenderManagerFactory::~PrerenderManagerFactory() {
46 } 44 }
47 45
48 ProfileKeyedService* PrerenderManagerFactory::BuildServiceInstanceFor( 46 ProfileKeyedService* PrerenderManagerFactory::BuildServiceInstanceFor(
49 Profile* profile) const { 47 Profile* profile) const {
50 CHECK(g_browser_process->prerender_tracker()); 48 CHECK(g_browser_process->prerender_tracker());
51 PrerenderManager* prerender_manager = new PrerenderManager( 49 PrerenderManager* prerender_manager = new PrerenderManager(
52 profile, g_browser_process->prerender_tracker()); 50 profile, g_browser_process->prerender_tracker());
53 #if defined(OS_CHROMEOS) 51 #if defined(OS_CHROMEOS)
54 if (chromeos::CrosLibrary::Get()) { 52 if (chromeos::CrosLibrary::Get()) {
55 prerender_manager->AddCondition( 53 prerender_manager->AddCondition(
56 new chromeos::PrerenderConditionNetwork( 54 new chromeos::PrerenderConditionNetwork(
57 chromeos::CrosLibrary::Get()->GetNetworkLibrary())); 55 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
58 } 56 }
59 #endif 57 #endif
60 return prerender_manager; 58 return prerender_manager;
61 } 59 }
62 60
63 bool PrerenderManagerFactory::ServiceHasOwnInstanceInIncognito() const { 61 bool PrerenderManagerFactory::ServiceHasOwnInstanceInIncognito() const {
64 return true; 62 return true;
65 } 63 }
66 64
67 } // namespace prerender 65 } // namespace prerender
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/prerender/prerender_manager.cc ('k') | trunk/src/chrome/browser/prerender/prerender_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698