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

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

Issue 42114: Don't leak visited site information from original profile to OTR profile.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 9 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
« no previous file with comments | « no previous file | chrome/common/visitedlink_common.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 virtual Profile* GetOffTheRecordProfile() { 136 virtual Profile* GetOffTheRecordProfile() {
137 return this; 137 return this;
138 } 138 }
139 139
140 virtual Profile* GetOriginalProfile() { 140 virtual Profile* GetOriginalProfile() {
141 return profile_; 141 return profile_;
142 } 142 }
143 143
144 virtual VisitedLinkMaster* GetVisitedLinkMaster() { 144 virtual VisitedLinkMaster* GetVisitedLinkMaster() {
145 return profile_->GetVisitedLinkMaster(); 145 // We don't provide access to the VisitedLinkMaster when we're OffTheRecord
146 // because we don't want to leak the sites that the user has visited before.
147 return NULL;
146 } 148 }
147 149
148 virtual ExtensionsService* GetExtensionsService() { 150 virtual ExtensionsService* GetExtensionsService() {
149 return profile_->GetExtensionsService(); 151 return profile_->GetExtensionsService();
150 } 152 }
151 153
152 virtual UserScriptMaster* GetUserScriptMaster() { 154 virtual UserScriptMaster* GetUserScriptMaster() {
153 return profile_->GetUserScriptMaster(); 155 return profile_->GetUserScriptMaster();
154 } 156 }
155 157
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 872
871 #ifdef CHROME_PERSONALIZATION 873 #ifdef CHROME_PERSONALIZATION
872 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() { 874 ProfilePersonalization* ProfileImpl::GetProfilePersonalization() {
873 DCHECK(!Personalization::IsP13NDisabled()); 875 DCHECK(!Personalization::IsP13NDisabled());
874 if (!personalization_.get()) 876 if (!personalization_.get())
875 personalization_.reset( 877 personalization_.reset(
876 Personalization::CreateProfilePersonalization(this)); 878 Personalization::CreateProfilePersonalization(this));
877 return personalization_.get(); 879 return personalization_.get();
878 } 880 }
879 #endif 881 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/common/visitedlink_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698