OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/profile.h" | 5 #include "chrome/browser/profile.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 } | 583 } |
584 | 584 |
585 virtual policy::ProfilePolicyContext* GetPolicyContext() { | 585 virtual policy::ProfilePolicyContext* GetPolicyContext() { |
586 return NULL; | 586 return NULL; |
587 } | 587 } |
588 | 588 |
589 virtual PromoCounter* GetInstantPromoCounter() { | 589 virtual PromoCounter* GetInstantPromoCounter() { |
590 return NULL; | 590 return NULL; |
591 } | 591 } |
592 | 592 |
| 593 virtual PrefProxyConfigTracker* GetProxyConfigTracker() { |
| 594 return profile_->GetProxyConfigTracker(); |
| 595 } |
| 596 |
593 private: | 597 private: |
594 NotificationRegistrar registrar_; | 598 NotificationRegistrar registrar_; |
595 | 599 |
596 // The real underlying profile. | 600 // The real underlying profile. |
597 Profile* profile_; | 601 Profile* profile_; |
598 | 602 |
599 scoped_ptr<ExtensionProcessManager> extension_process_manager_; | 603 scoped_ptr<ExtensionProcessManager> extension_process_manager_; |
600 | 604 |
601 // The context to use for requests made from this OTR session. | 605 // The context to use for requests made from this OTR session. |
602 scoped_refptr<ChromeURLRequestContextGetter> request_context_; | 606 scoped_refptr<ChromeURLRequestContextGetter> request_context_; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
650 | 654 |
651 // The file_system context for this profile. | 655 // The file_system context for this profile. |
652 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; | 656 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; |
653 | 657 |
654 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); | 658 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); |
655 }; | 659 }; |
656 | 660 |
657 Profile* Profile::CreateOffTheRecordProfile() { | 661 Profile* Profile::CreateOffTheRecordProfile() { |
658 return new OffTheRecordProfileImpl(this); | 662 return new OffTheRecordProfileImpl(this); |
659 } | 663 } |
OLD | NEW |