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

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

Issue 5023001: Handful of related instant changes: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux build 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
« no previous file with comments | « chrome/browser/profile.h ('k') | chrome/browser/profile_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 blob_storage_context_.get(), 574 blob_storage_context_.get(),
575 &ChromeBlobStorageContext::InitializeOnIOThread)); 575 &ChromeBlobStorageContext::InitializeOnIOThread));
576 } 576 }
577 return blob_storage_context_; 577 return blob_storage_context_;
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() {
585 return NULL;
586 }
587
584 private: 588 private:
585 NotificationRegistrar registrar_; 589 NotificationRegistrar registrar_;
586 590
587 // The real underlying profile. 591 // The real underlying profile.
588 Profile* profile_; 592 Profile* profile_;
589 593
590 scoped_ptr<ExtensionProcessManager> extension_process_manager_; 594 scoped_ptr<ExtensionProcessManager> extension_process_manager_;
591 595
592 // The context to use for requests made from this OTR session. 596 // The context to use for requests made from this OTR session.
593 scoped_refptr<ChromeURLRequestContextGetter> request_context_; 597 scoped_refptr<ChromeURLRequestContextGetter> request_context_;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 645
642 // The file_system context for this profile. 646 // The file_system context for this profile.
643 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; 647 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_;
644 648
645 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 649 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
646 }; 650 };
647 651
648 Profile* Profile::CreateOffTheRecordProfile() { 652 Profile* Profile::CreateOffTheRecordProfile() {
649 return new OffTheRecordProfileImpl(this); 653 return new OffTheRecordProfileImpl(this);
650 } 654 }
OLDNEW
« no previous file with comments | « chrome/browser/profile.h ('k') | chrome/browser/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698