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/profiles/profile_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: Another round of comments 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after
1629 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { 1629 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
1630 if (!pref_proxy_config_tracker_) 1630 if (!pref_proxy_config_tracker_)
1631 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); 1631 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
1632 1632
1633 return pref_proxy_config_tracker_; 1633 return pref_proxy_config_tracker_;
1634 } 1634 }
1635 1635
1636 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1636 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1637 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1637 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1638 return NULL; 1638 return NULL;
1639 if (!prerender_manager_.get()) 1639 if (!prerender_manager_.get()) {
1640 prerender_manager_.reset(new prerender::PrerenderManager(this)); 1640 CHECK(g_browser_process->prerender_tracker());
1641 prerender_manager_.reset(
1642 new prerender::PrerenderManager(
1643 this, g_browser_process->prerender_tracker()));
1644 }
1641 return prerender_manager_.get(); 1645 return prerender_manager_.get();
1642 } 1646 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698