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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 NotificationService::current()->Notify( | 699 NotificationService::current()->Notify( |
700 NotificationType::OTR_PROFILE_CREATED, | 700 NotificationType::OTR_PROFILE_CREATED, |
701 Source<Profile>(off_the_record_profile_.get()), | 701 Source<Profile>(off_the_record_profile_.get()), |
702 NotificationService::NoDetails()); | 702 NotificationService::NoDetails()); |
703 } | 703 } |
704 return off_the_record_profile_.get(); | 704 return off_the_record_profile_.get(); |
705 } | 705 } |
706 | 706 |
707 void ProfileImpl::DestroyOffTheRecordProfile() { | 707 void ProfileImpl::DestroyOffTheRecordProfile() { |
708 off_the_record_profile_.reset(); | 708 off_the_record_profile_.reset(); |
| 709 extension_pref_value_map_->ClearAllIncognitoSessionOnlyPreferences(); |
709 } | 710 } |
710 | 711 |
711 bool ProfileImpl::HasOffTheRecordProfile() { | 712 bool ProfileImpl::HasOffTheRecordProfile() { |
712 return off_the_record_profile_.get() != NULL; | 713 return off_the_record_profile_.get() != NULL; |
713 } | 714 } |
714 | 715 |
715 Profile* ProfileImpl::GetOriginalProfile() { | 716 Profile* ProfileImpl::GetOriginalProfile() { |
716 return this; | 717 return this; |
717 } | 718 } |
718 | 719 |
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1627 return pref_proxy_config_tracker_; | 1628 return pref_proxy_config_tracker_; |
1628 } | 1629 } |
1629 | 1630 |
1630 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { | 1631 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { |
1631 if (!prerender::PrerenderManager::IsPrerenderingPossible()) | 1632 if (!prerender::PrerenderManager::IsPrerenderingPossible()) |
1632 return NULL; | 1633 return NULL; |
1633 if (!prerender_manager_.get()) | 1634 if (!prerender_manager_.get()) |
1634 prerender_manager_.reset(new prerender::PrerenderManager(this)); | 1635 prerender_manager_.reset(new prerender::PrerenderManager(this)); |
1635 return prerender_manager_.get(); | 1636 return prerender_manager_.get(); |
1636 } | 1637 } |
OLD | NEW |