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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 6966017: Remove a chrome dependency by removing Prerender from ResourceDispatcherHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 51dc4524a489b7053a6167fa805b2d4c37a506c6..481fa180eac6c4702e177b8cb6d6409efb6af4c9 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -45,10 +45,12 @@
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prerender/prerender_tracker.h"
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/printing/print_preview_tab_controller.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_observer.h"
#include "chrome/browser/safe_browsing/client_side_detection_service.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/shell_integration.h"
@@ -694,6 +696,13 @@ ChromeNetLog* BrowserProcessImpl::net_log() {
return net_log_.get();
}
+prerender::PrerenderTracker* BrowserProcessImpl::prerender_tracker() {
+ if (!prerender_tracker_.get())
+ prerender_tracker_.reset(new prerender::PrerenderTracker);
+
+ return prerender_tracker_.get();
+}
+
void BrowserProcessImpl::ClearLocalState(const FilePath& profile_path) {
webkit_database::DatabaseTracker::ClearLocalState(profile_path);
BrowsingDataRemover::ClearGearsData(profile_path);
@@ -730,6 +739,11 @@ void BrowserProcessImpl::CreateResourceDispatcherHost() {
resource_dispatcher_host_.reset(
new ResourceDispatcherHost(resource_queue_delegates));
resource_dispatcher_host_->Initialize();
+
+ resource_dispatcher_host_observer_.reset(
+ new ChromeResourceDispatcherHostObserver(prerender_tracker()));
+ resource_dispatcher_host_->set_observer(
+ resource_dispatcher_host_observer_.get());
}
void BrowserProcessImpl::CreateMetricsService() {
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698