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

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

Issue 10873022: Revert 152904 - Moving FaviconService to a ProfileKeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 ExtensionSpecialStoragePolicy* 213 ExtensionSpecialStoragePolicy*
214 OffTheRecordProfileImpl::GetExtensionSpecialStoragePolicy() { 214 OffTheRecordProfileImpl::GetExtensionSpecialStoragePolicy() {
215 return GetOriginalProfile()->GetExtensionSpecialStoragePolicy(); 215 return GetOriginalProfile()->GetExtensionSpecialStoragePolicy();
216 } 216 }
217 217
218 GAIAInfoUpdateService* OffTheRecordProfileImpl::GetGAIAInfoUpdateService() { 218 GAIAInfoUpdateService* OffTheRecordProfileImpl::GetGAIAInfoUpdateService() {
219 return NULL; 219 return NULL;
220 } 220 }
221 221
222 FaviconService* OffTheRecordProfileImpl::GetFaviconService(
223 ServiceAccessType sat) {
224 if (sat == EXPLICIT_ACCESS)
225 return profile_->GetFaviconService(sat);
226
227 NOTREACHED() << "This profile is OffTheRecord";
228 return NULL;
229 }
230
222 policy::UserCloudPolicyManager* 231 policy::UserCloudPolicyManager*
223 OffTheRecordProfileImpl::GetUserCloudPolicyManager() { 232 OffTheRecordProfileImpl::GetUserCloudPolicyManager() {
224 return profile_->GetUserCloudPolicyManager(); 233 return profile_->GetUserCloudPolicyManager();
225 } 234 }
226 235
227 policy::PolicyService* OffTheRecordProfileImpl::GetPolicyService() { 236 policy::PolicyService* OffTheRecordProfileImpl::GetPolicyService() {
228 return profile_->GetPolicyService(); 237 return profile_->GetPolicyService();
229 } 238 }
230 239
231 PrefService* OffTheRecordProfileImpl::GetPrefs() { 240 PrefService* OffTheRecordProfileImpl::GetPrefs() {
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 if (!profile) 477 if (!profile)
469 profile = new OffTheRecordProfileImpl(this); 478 profile = new OffTheRecordProfileImpl(this);
470 profile->Init(); 479 profile->Init();
471 return profile; 480 return profile;
472 } 481 }
473 482
474 base::Callback<ChromeURLDataManagerBackend*(void)> 483 base::Callback<ChromeURLDataManagerBackend*(void)>
475 OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const { 484 OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const {
476 return io_data_.GetChromeURLDataManagerBackendGetter(); 485 return io_data_.GetChromeURLDataManagerBackendGetter();
477 } 486 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.h ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698