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

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

Issue 13865012: Change GetProfileToUse method from Profile to content::BrowserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compile & deps Created 7 years, 7 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" 10 #include "chrome/browser/predictors/predictor_database_factory.h"
11 #include "chrome/browser/prerender/prerender_manager.h" 11 #include "chrome/browser/prerender/prerender_manager.h"
12 #include "chrome/browser/profiles/incognito_helpers.h"
12 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_dependency_manager.h" 14 #include "chrome/browser/profiles/profile_dependency_manager.h"
14 15
15 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
16 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
17 #include "chrome/browser/chromeos/prerender_condition_network.h" 18 #include "chrome/browser/chromeos/prerender_condition_network.h"
18 #endif 19 #endif
19 20
20 namespace prerender { 21 namespace prerender {
21 22
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #if defined(OS_CHROMEOS) 54 #if defined(OS_CHROMEOS)
54 if (chromeos::CrosLibrary::Get()) { 55 if (chromeos::CrosLibrary::Get()) {
55 prerender_manager->AddCondition( 56 prerender_manager->AddCondition(
56 new chromeos::PrerenderConditionNetwork( 57 new chromeos::PrerenderConditionNetwork(
57 chromeos::CrosLibrary::Get()->GetNetworkLibrary())); 58 chromeos::CrosLibrary::Get()->GetNetworkLibrary()));
58 } 59 }
59 #endif 60 #endif
60 return prerender_manager; 61 return prerender_manager;
61 } 62 }
62 63
63 bool PrerenderManagerFactory::ServiceHasOwnInstanceInIncognito() const { 64 content::BrowserContext* PrerenderManagerFactory::GetBrowserContextToUse(
64 return true; 65 content::BrowserContext* context) const {
66 return chrome::GetBrowserContextOwnInstanceInIncognito(context);
65 } 67 }
66 68
67 } // namespace prerender 69 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698