Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(907)

Side by Side Diff: chrome/browser/profiles/profile.cc

Issue 6292017: Extended: Add "system" URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 return profile_->last_selected_directory(); 576 return profile_->last_selected_directory();
577 } 577 }
578 return directory; 578 return directory;
579 } 579 }
580 580
581 virtual void set_last_selected_directory(const FilePath& path) { 581 virtual void set_last_selected_directory(const FilePath& path) {
582 last_selected_directory_ = path; 582 last_selected_directory_ = path;
583 } 583 }
584 584
585 #if defined(OS_CHROMEOS) 585 #if defined(OS_CHROMEOS)
586 virtual chromeos::ProxyConfigServiceImpl*
587 GetChromeOSProxyConfigServiceImpl() {
588 return profile_->GetChromeOSProxyConfigServiceImpl();
589 }
590
591 virtual void SetupChromeOSEnterpriseExtensionObserver() { 586 virtual void SetupChromeOSEnterpriseExtensionObserver() {
592 profile_->SetupChromeOSEnterpriseExtensionObserver(); 587 profile_->SetupChromeOSEnterpriseExtensionObserver();
593 } 588 }
594 589
595 virtual void InitChromeOSPreferences() { 590 virtual void InitChromeOSPreferences() {
596 // The off-the-record profile shouldn't have Chrome OS's preferences. 591 // The off-the-record profile shouldn't have Chrome OS's preferences.
597 // The preferences are associated with the regular user profile. 592 // The preferences are associated with the regular user profile.
598 } 593 }
599 #endif // defined(OS_CHROMEOS) 594 #endif // defined(OS_CHROMEOS)
600 595
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 }; 751 };
757 #endif 752 #endif
758 753
759 Profile* Profile::CreateOffTheRecordProfile() { 754 Profile* Profile::CreateOffTheRecordProfile() {
760 #if defined(OS_CHROMEOS) 755 #if defined(OS_CHROMEOS)
761 if (Profile::IsGuestSession()) 756 if (Profile::IsGuestSession())
762 return new GuestSessionProfile(this); 757 return new GuestSessionProfile(this);
763 #endif 758 #endif
764 return new OffTheRecordProfileImpl(this); 759 return new OffTheRecordProfileImpl(this);
765 } 760 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698