OLD | NEW |
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 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1638 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { | 1638 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { |
1639 if (!pref_proxy_config_tracker_) | 1639 if (!pref_proxy_config_tracker_) |
1640 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); | 1640 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); |
1641 | 1641 |
1642 return pref_proxy_config_tracker_; | 1642 return pref_proxy_config_tracker_; |
1643 } | 1643 } |
1644 | 1644 |
1645 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { | 1645 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { |
1646 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1646 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
1647 return NULL; | 1647 return NULL; |
1648 if (!prerender_manager_.get()) | 1648 if (!prerender_manager_.get()) { |
1649 prerender_manager_.reset(new prerender::PrerenderManager(this)); | 1649 CHECK(g_browser_process->prerender_tracker()); |
| 1650 prerender_manager_.reset( |
| 1651 new prerender::PrerenderManager( |
| 1652 this, g_browser_process->prerender_tracker())); |
| 1653 } |
1650 return prerender_manager_.get(); | 1654 return prerender_manager_.get(); |
1651 } | 1655 } |
OLD | NEW |