| 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 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1560 } | 1560 } |
| 1561 return blob_storage_context_; | 1561 return blob_storage_context_; |
| 1562 } | 1562 } |
| 1563 | 1563 |
| 1564 ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() { | 1564 ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() { |
| 1565 return extension_info_map_.get(); | 1565 return extension_info_map_.get(); |
| 1566 } | 1566 } |
| 1567 | 1567 |
| 1568 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() { | 1568 ChromeURLDataManager* ProfileImpl::GetChromeURLDataManager() { |
| 1569 if (!chrome_url_data_manager_.get()) | 1569 if (!chrome_url_data_manager_.get()) |
| 1570 chrome_url_data_manager_.reset(new ChromeURLDataManager(this)); | 1570 chrome_url_data_manager_.reset(new ChromeURLDataManager( |
| 1571 io_data_.GetChromeURLDataManagerBackendGetter())); |
| 1571 return chrome_url_data_manager_.get(); | 1572 return chrome_url_data_manager_.get(); |
| 1572 } | 1573 } |
| 1573 | 1574 |
| 1574 PromoCounter* ProfileImpl::GetInstantPromoCounter() { | 1575 PromoCounter* ProfileImpl::GetInstantPromoCounter() { |
| 1575 #if defined(OS_WIN) | 1576 #if defined(OS_WIN) |
| 1576 // TODO: enable this when we're ready to turn on the promo. | 1577 // TODO: enable this when we're ready to turn on the promo. |
| 1577 /* | 1578 /* |
| 1578 if (!checked_instant_promo_) { | 1579 if (!checked_instant_promo_) { |
| 1579 checked_instant_promo_ = true; | 1580 checked_instant_promo_ = true; |
| 1580 PrefService* prefs = GetPrefs(); | 1581 PrefService* prefs = GetPrefs(); |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1701 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1702 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
| 1702 return NULL; | 1703 return NULL; |
| 1703 if (!prerender_manager_.get()) { | 1704 if (!prerender_manager_.get()) { |
| 1704 CHECK(g_browser_process->prerender_tracker()); | 1705 CHECK(g_browser_process->prerender_tracker()); |
| 1705 prerender_manager_.reset( | 1706 prerender_manager_.reset( |
| 1706 new prerender::PrerenderManager( | 1707 new prerender::PrerenderManager( |
| 1707 this, g_browser_process->prerender_tracker())); | 1708 this, g_browser_process->prerender_tracker())); |
| 1708 } | 1709 } |
| 1709 return prerender_manager_.get(); | 1710 return prerender_manager_.get(); |
| 1710 } | 1711 } |
| OLD | NEW |