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 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
589 return profile_->last_selected_directory(); | 589 return profile_->last_selected_directory(); |
590 } | 590 } |
591 return directory; | 591 return directory; |
592 } | 592 } |
593 | 593 |
594 virtual void set_last_selected_directory(const FilePath& path) { | 594 virtual void set_last_selected_directory(const FilePath& path) { |
595 last_selected_directory_ = path; | 595 last_selected_directory_ = path; |
596 } | 596 } |
597 | 597 |
598 #if defined(OS_CHROMEOS) | 598 #if defined(OS_CHROMEOS) |
599 virtual chromeos::ProxyConfigServiceImpl* | |
600 GetChromeOSProxyConfigServiceImpl() { | |
601 return profile_->GetChromeOSProxyConfigServiceImpl(); | |
602 } | |
603 | |
604 virtual void SetupChromeOSEnterpriseExtensionObserver() { | 599 virtual void SetupChromeOSEnterpriseExtensionObserver() { |
605 profile_->SetupChromeOSEnterpriseExtensionObserver(); | 600 profile_->SetupChromeOSEnterpriseExtensionObserver(); |
606 } | 601 } |
607 | 602 |
608 virtual void InitChromeOSPreferences() { | 603 virtual void InitChromeOSPreferences() { |
609 // The incognito profile shouldn't have Chrome OS's preferences. | 604 // The incognito profile shouldn't have Chrome OS's preferences. |
610 // The preferences are associated with the regular user profile. | 605 // The preferences are associated with the regular user profile. |
611 } | 606 } |
612 #endif // defined(OS_CHROMEOS) | 607 #endif // defined(OS_CHROMEOS) |
613 | 608 |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
771 }; | 766 }; |
772 #endif | 767 #endif |
773 | 768 |
774 Profile* Profile::CreateOffTheRecordProfile() { | 769 Profile* Profile::CreateOffTheRecordProfile() { |
775 #if defined(OS_CHROMEOS) | 770 #if defined(OS_CHROMEOS) |
776 if (Profile::IsGuestSession()) | 771 if (Profile::IsGuestSession()) |
777 return new GuestSessionProfile(this); | 772 return new GuestSessionProfile(this); |
778 #endif | 773 #endif |
779 return new OffTheRecordProfileImpl(this); | 774 return new OffTheRecordProfileImpl(this); |
780 } | 775 } |
OLD | NEW |