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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
645 virtual PromoCounter* GetInstantPromoCounter() { | 645 virtual PromoCounter* GetInstantPromoCounter() { |
646 return NULL; | 646 return NULL; |
647 } | 647 } |
648 | 648 |
649 #if defined(OS_CHROMEOS) | 649 #if defined(OS_CHROMEOS) |
650 virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) { | 650 virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) { |
651 } | 651 } |
652 #endif // defined(OS_CHROMEOS) | 652 #endif // defined(OS_CHROMEOS) |
653 | 653 |
654 virtual PrefProxyConfigTracker* GetProxyConfigTracker() { | 654 virtual PrefProxyConfigTracker* GetProxyConfigTracker() { |
655 if (!pref_proxy_config_tracker_) | 655 if (!pref_proxy_config_tracker_) { |
656 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); | 656 pref_proxy_config_tracker_ = |
| 657 new PrefProxyConfigTracker(GetPrefs(), |
| 658 g_browser_process->local_state()); |
| 659 } |
657 | 660 |
658 return pref_proxy_config_tracker_; | 661 return pref_proxy_config_tracker_; |
659 } | 662 } |
660 | 663 |
661 virtual prerender::PrerenderManager* GetPrerenderManager() { | 664 virtual prerender::PrerenderManager* GetPrerenderManager() { |
662 // We do not allow prerendering in OTR profiles at this point. | 665 // We do not allow prerendering in OTR profiles at this point. |
663 // TODO(tburkard): Figure out if we want to support this, and how, at some | 666 // TODO(tburkard): Figure out if we want to support this, and how, at some |
664 // point in the future. | 667 // point in the future. |
665 return NULL; | 668 return NULL; |
666 } | 669 } |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
756 }; | 759 }; |
757 #endif | 760 #endif |
758 | 761 |
759 Profile* Profile::CreateOffTheRecordProfile() { | 762 Profile* Profile::CreateOffTheRecordProfile() { |
760 #if defined(OS_CHROMEOS) | 763 #if defined(OS_CHROMEOS) |
761 if (Profile::IsGuestSession()) | 764 if (Profile::IsGuestSession()) |
762 return new GuestSessionProfile(this); | 765 return new GuestSessionProfile(this); |
763 #endif | 766 #endif |
764 return new OffTheRecordProfileImpl(this); | 767 return new OffTheRecordProfileImpl(this); |
765 } | 768 } |
OLD | NEW |