| 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 1500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1511 } | 1511 } |
| 1512 return blob_storage_context_; | 1512 return blob_storage_context_; |
| 1513 } | 1513 } |
| 1514 | 1514 |
| 1515 ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() { | 1515 ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() { |
| 1516 return extension_info_map_.get(); | 1516 return extension_info_map_.get(); |
| 1517 } | 1517 } |
| 1518 | 1518 |
| 1519 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() { | 1519 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() { |
| 1520 if (!chrome_url_data_manager_.get()) | 1520 if (!chrome_url_data_manager_.get()) |
| 1521 chrome_url_data_manager_.reset(new ChromeURLDataManager( | 1521 chrome_url_data_manager_.reset(new ChromeURLDataManager(this)); |
| 1522 io_data_.GetChromeURLDataManagerBackendGetter())); | |
| 1523 return chrome_url_data_manager_.get(); | 1522 return chrome_url_data_manager_.get(); |
| 1524 } | 1523 } |
| 1525 | 1524 |
| 1526 PromoCounter* ProfileImpl::GetInstantPromoCounter() { | 1525 PromoCounter* ProfileImpl::GetInstantPromoCounter() { |
| 1527 #if defined(OS_WIN) | 1526 #if defined(OS_WIN) |
| 1528 // TODO: enable this when we're ready to turn on the promo. | 1527 // TODO: enable this when we're ready to turn on the promo. |
| 1529 /* | 1528 /* |
| 1530 if (!checked_instant_promo_) { | 1529 if (!checked_instant_promo_) { |
| 1531 checked_instant_promo_ = true; | 1530 checked_instant_promo_ = true; |
| 1532 PrefService* prefs = GetPrefs(); | 1531 PrefService* prefs = GetPrefs(); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1653 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1652 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
| 1654 return NULL; | 1653 return NULL; |
| 1655 if (!prerender_manager_.get()) { | 1654 if (!prerender_manager_.get()) { |
| 1656 CHECK(g_browser_process->prerender_tracker()); | 1655 CHECK(g_browser_process->prerender_tracker()); |
| 1657 prerender_manager_.reset( | 1656 prerender_manager_.reset( |
| 1658 new prerender::PrerenderManager( | 1657 new prerender::PrerenderManager( |
| 1659 this, g_browser_process->prerender_tracker())); | 1658 this, g_browser_process->prerender_tracker())); |
| 1660 } | 1659 } |
| 1661 return prerender_manager_.get(); | 1660 return prerender_manager_.get(); |
| 1662 } | 1661 } |
| OLD | NEW |