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

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

Issue 5005002: Dynamically refresh pref-configured proxies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Eric's feedback. Created 10 years, 1 month 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) 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 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 } 578 }
579 579
580 virtual ExtensionInfoMap* GetExtensionInfoMap() { 580 virtual ExtensionInfoMap* GetExtensionInfoMap() {
581 return profile_->GetExtensionInfoMap(); 581 return profile_->GetExtensionInfoMap();
582 } 582 }
583 583
584 virtual PromoCounter* GetInstantPromoCounter() { 584 virtual PromoCounter* GetInstantPromoCounter() {
585 return NULL; 585 return NULL;
586 } 586 }
587 587
588 virtual PrefProxyConfigTracker* GetProxyConfigTracker() {
589 return profile_->GetProxyConfigTracker();
590 }
591
588 private: 592 private:
589 NotificationRegistrar registrar_; 593 NotificationRegistrar registrar_;
590 594
591 // The real underlying profile. 595 // The real underlying profile.
592 Profile* profile_; 596 Profile* profile_;
593 597
594 scoped_ptr<ExtensionProcessManager> extension_process_manager_; 598 scoped_ptr<ExtensionProcessManager> extension_process_manager_;
595 599
596 // The context to use for requests made from this OTR session. 600 // The context to use for requests made from this OTR session.
597 scoped_refptr<ChromeURLRequestContextGetter> request_context_; 601 scoped_refptr<ChromeURLRequestContextGetter> request_context_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 649
646 // The file_system context for this profile. 650 // The file_system context for this profile.
647 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; 651 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_;
648 652
649 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 653 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
650 }; 654 };
651 655
652 Profile* Profile::CreateOffTheRecordProfile() { 656 Profile* Profile::CreateOffTheRecordProfile() {
653 return new OffTheRecordProfileImpl(this); 657 return new OffTheRecordProfileImpl(this);
654 } 658 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698