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

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

Issue 16272002: [Chrome OS] Make PrerenderConditionNetwork use NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm obsolete comment Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/prerender_condition_network.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/extensions/extension_system_factory.h" 9 #include "chrome/browser/extensions/extension_system_factory.h"
10 #include "chrome/browser/history/history_service_factory.h" 10 #include "chrome/browser/history/history_service_factory.h"
11 #include "chrome/browser/predictors/predictor_database_factory.h" 11 #include "chrome/browser/predictors/predictor_database_factory.h"
12 #include "chrome/browser/prerender/prerender_manager.h" 12 #include "chrome/browser/prerender/prerender_manager.h"
13 #include "chrome/browser/profiles/incognito_helpers.h" 13 #include "chrome/browser/profiles/incognito_helpers.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h" 15 #include "components/browser_context_keyed_service/browser_context_dependency_ma nager.h"
16 16
17 #if defined(OS_CHROMEOS) 17 #if defined(OS_CHROMEOS)
18 #include "chrome/browser/chromeos/cros/cros_library.h"
19 #include "chrome/browser/chromeos/prerender_condition_network.h" 18 #include "chrome/browser/chromeos/prerender_condition_network.h"
19 #include "chromeos/network/network_handler.h"
20 #endif 20 #endif
21 21
22 namespace prerender { 22 namespace prerender {
23 23
24 // static 24 // static
25 PrerenderManager* PrerenderManagerFactory::GetForProfile( 25 PrerenderManager* PrerenderManagerFactory::GetForProfile(
26 Profile* profile) { 26 Profile* profile) {
27 TRACE_EVENT0("browser", "PrerenderManagerFactory::GetForProfile") 27 TRACE_EVENT0("browser", "PrerenderManagerFactory::GetForProfile")
28 if (!PrerenderManager::IsPrerenderingPossible()) 28 if (!PrerenderManager::IsPrerenderingPossible())
29 return NULL; 29 return NULL;
(...skipping 18 matching lines...) Expand all
48 48
49 PrerenderManagerFactory::~PrerenderManagerFactory() { 49 PrerenderManagerFactory::~PrerenderManagerFactory() {
50 } 50 }
51 51
52 BrowserContextKeyedService* PrerenderManagerFactory::BuildServiceInstanceFor( 52 BrowserContextKeyedService* PrerenderManagerFactory::BuildServiceInstanceFor(
53 content::BrowserContext* profile) const { 53 content::BrowserContext* profile) const {
54 CHECK(g_browser_process->prerender_tracker()); 54 CHECK(g_browser_process->prerender_tracker());
55 PrerenderManager* prerender_manager = new PrerenderManager( 55 PrerenderManager* prerender_manager = new PrerenderManager(
56 static_cast<Profile*>(profile), g_browser_process->prerender_tracker()); 56 static_cast<Profile*>(profile), g_browser_process->prerender_tracker());
57 #if defined(OS_CHROMEOS) 57 #if defined(OS_CHROMEOS)
58 if (chromeos::CrosLibrary::Get()) { 58 if (chromeos::NetworkHandler::IsInitialized())
59 prerender_manager->AddCondition( 59 prerender_manager->AddCondition(new chromeos::PrerenderConditionNetwork);
60 new chromeos::PrerenderConditionNetwork(
61 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
62 }
63 #endif 60 #endif
64 return prerender_manager; 61 return prerender_manager;
65 } 62 }
66 63
67 content::BrowserContext* PrerenderManagerFactory::GetBrowserContextToUse( 64 content::BrowserContext* PrerenderManagerFactory::GetBrowserContextToUse(
68 content::BrowserContext* context) const { 65 content::BrowserContext* context) const {
69 return chrome::GetBrowserContextOwnInstanceInIncognito(context); 66 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
70 } 67 }
71 68
72 } // namespace prerender 69 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/prerender_condition_network.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698