| 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.h" | 5 #include "chrome/browser/profiles/profile.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 return profile_->GetExtensionInfoMap(); | 699 return profile_->GetExtensionInfoMap(); |
| 700 } | 700 } |
| 701 | 701 |
| 702 virtual ChromeURLDataManager* GetChromeURLDataManager() { | 702 virtual ChromeURLDataManager* GetChromeURLDataManager() { |
| 703 if (!chrome_url_data_manager_.get()) | 703 if (!chrome_url_data_manager_.get()) |
| 704 chrome_url_data_manager_.reset(new ChromeURLDataManager( | 704 chrome_url_data_manager_.reset(new ChromeURLDataManager( |
| 705 io_data_.GetChromeURLDataManagerBackendGetter())); | 705 io_data_.GetChromeURLDataManagerBackendGetter())); |
| 706 return chrome_url_data_manager_.get(); | 706 return chrome_url_data_manager_.get(); |
| 707 } | 707 } |
| 708 | 708 |
| 709 virtual policy::HostBlacklistManager* GetHostBlacklistManager() { |
| 710 return GetOriginalProfile()->GetHostBlacklistManager(); |
| 711 } |
| 712 |
| 709 virtual PromoCounter* GetInstantPromoCounter() { | 713 virtual PromoCounter* GetInstantPromoCounter() { |
| 710 return NULL; | 714 return NULL; |
| 711 } | 715 } |
| 712 | 716 |
| 713 #if defined(OS_CHROMEOS) | 717 #if defined(OS_CHROMEOS) |
| 714 virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) { | 718 virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) { |
| 715 } | 719 } |
| 716 virtual void OnLogin() { | 720 virtual void OnLogin() { |
| 717 } | 721 } |
| 718 #endif // defined(OS_CHROMEOS) | 722 #endif // defined(OS_CHROMEOS) |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 870 }; | 874 }; |
| 871 #endif | 875 #endif |
| 872 | 876 |
| 873 Profile* Profile::CreateOffTheRecordProfile() { | 877 Profile* Profile::CreateOffTheRecordProfile() { |
| 874 #if defined(OS_CHROMEOS) | 878 #if defined(OS_CHROMEOS) |
| 875 if (Profile::IsGuestSession()) | 879 if (Profile::IsGuestSession()) |
| 876 return new GuestSessionProfile(this); | 880 return new GuestSessionProfile(this); |
| 877 #endif | 881 #endif |
| 878 return new OffTheRecordProfileImpl(this); | 882 return new OffTheRecordProfileImpl(this); |
| 879 } | 883 } |
| OLD | NEW |