summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 15:47:17 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 15:47:17 +0000
commit8b2f1dfdf5392bb3e66b50cd28621994319a75ed (patch)
tree118db8c3e6773f46ccd9b68336c8c87f482874e7 /chrome/browser/profiles
parent7bd041f4dbbb55ee8f90f36310df994759b4796d (diff)
downloadchromium_src-8b2f1dfdf5392bb3e66b50cd28621994319a75ed.zip
chromium_src-8b2f1dfdf5392bb3e66b50cd28621994319a75ed.tar.gz
chromium_src-8b2f1dfdf5392bb3e66b50cd28621994319a75ed.tar.bz2
Remove Prerender from ResourceContext and ProfileIOData.
BUG=95222 Review URL: http://codereview.chromium.org/8175011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
-rw-r--r--chrome/browser/profiles/profile_io_data.cc15
-rw-r--r--chrome/browser/profiles/profile_io_data.h7
2 files changed, 0 insertions, 22 deletions
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 58516db..24dd15a 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -30,8 +30,6 @@
#include "chrome/browser/notifications/desktop_notification_service_factory.h"
#include "chrome/browser/policy/url_blacklist_manager.h"
#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/prerender/prerender_manager.h"
-#include "chrome/browser/prerender/prerender_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/transport_security_persister.h"
@@ -181,15 +179,6 @@ Profile* GetProfileOnUI(ProfileManager* profile_manager, Profile* profile) {
return NULL;
}
-prerender::PrerenderManager* GetPrerenderManagerOnUI(
- const base::Callback<Profile*(void)>& profile_getter) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- Profile* profile = profile_getter.Run();
- if (profile)
- return prerender::PrerenderManagerFactory::GetForProfile(profile);
- return NULL;
-}
-
} // namespace
void ProfileIOData::InitializeOnUIThread(Profile* profile) {
@@ -245,8 +234,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
params->extension_info_map = profile->GetExtensionInfoMap();
params->notification_service =
DesktopNotificationServiceFactory::GetForProfile(profile);
- params->prerender_manager_getter =
- base::Bind(&GetPrerenderManagerOnUI, profile_getter);
params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
params->proxy_config_service.reset(
@@ -497,7 +484,6 @@ void ProfileIOData::LazyInitialize() const {
host_content_settings_map_ = profile_params_->host_content_settings_map;
notification_service_ = profile_params_->notification_service;
extension_info_map_ = profile_params_->extension_info_map;
- prerender_manager_getter_ = profile_params_->prerender_manager_getter;
resource_context_.set_host_resolver(io_thread_globals->host_resolver.get());
resource_context_.set_request_context(main_request_context_);
@@ -507,7 +493,6 @@ void ProfileIOData::LazyInitialize() const {
resource_context_.set_file_system_context(file_system_context_);
resource_context_.set_quota_manager(quota_manager_);
resource_context_.set_host_zoom_map(host_zoom_map_);
- resource_context_.set_prerender_manager_getter(prerender_manager_getter_);
resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this));
resource_context_.set_media_observer(
io_thread_globals->media.media_internals.get());
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index 282be52..da4e2b5 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -56,10 +56,6 @@ namespace policy {
class URLBlacklistManager;
} // namespace policy
-namespace prerender {
-class PrerenderManager;
-}; // namespace prerender
-
namespace quota {
class QuotaManager;
}; // namespace quota
@@ -160,7 +156,6 @@ class ProfileIOData {
scoped_refptr<quota::QuotaManager> quota_manager;
scoped_refptr<ExtensionInfoMap> extension_info_map;
DesktopNotificationService* notification_service;
- base::Callback<prerender::PrerenderManager*(void)> prerender_manager_getter;
scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
// We need to initialize the ProxyConfigService from the UI thread
// because on linux it relies on initializing things through gconf,
@@ -299,8 +294,6 @@ class ProfileIOData {
mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
mutable DesktopNotificationService* notification_service_;
- mutable base::Callback<prerender::PrerenderManager*(void)>
- prerender_manager_getter_;
mutable ResourceContext resource_context_;