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

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

Issue 5174006: Move DeviceManagementPolicyProvider into the profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address 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 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 policy::DeviceManagementPolicyProvider*
585 GetDeviceManagementPolicyProvider() {
586 return NULL;
587 }
588
584 virtual PromoCounter* GetInstantPromoCounter() { 589 virtual PromoCounter* GetInstantPromoCounter() {
585 return NULL; 590 return NULL;
586 } 591 }
587 592
588 private: 593 private:
589 NotificationRegistrar registrar_; 594 NotificationRegistrar registrar_;
590 595
591 // The real underlying profile. 596 // The real underlying profile.
592 Profile* profile_; 597 Profile* profile_;
593 598
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 650
646 // The file_system context for this profile. 651 // The file_system context for this profile.
647 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_; 652 scoped_refptr<BrowserFileSystemContext> browser_file_system_context_;
648 653
649 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl); 654 DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
650 }; 655 };
651 656
652 Profile* Profile::CreateOffTheRecordProfile() { 657 Profile* Profile::CreateOffTheRecordProfile() {
653 return new OffTheRecordProfileImpl(this); 658 return new OffTheRecordProfileImpl(this);
654 } 659 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698