chrome/browser/content_settings/content_settings_base_provider.cc - Issue 6635032: Removing references to off the record in comments and log messages.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/content_settings_base_provider.cc

Issue 6635032: Removing references to off the record in comments and log messages. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fix issues pointed out by code reviewer Created 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_base_provider.h ('k') | chrome/browser/content_settings/content_settings_pref_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_base_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_base_provider.cc b/chrome/browser/content_settings/content_settings_base_provider.cc

index b0e7ced8732e37d3b2f2567e228e3e34544f70b4..fdfdc6fc0a4ef03e52612714e7843337ea69d4fa 100644

--- a/chrome/browser/content_settings/content_settings_base_provider.cc

+++ b/chrome/browser/content_settings/content_settings_base_provider.cc

@@ -97,8 +97,8 @@ ContentSetting BaseProvider::GetContentSetting(

requested_setting)->second;

}

- // If this map is not for an off-the-record profile, these searches will never

- // match. The additional off-the-record exceptions always overwrite the

+ // If this map is not for an incognito profile, these searches will never

+ // match. The additional incognito exceptions always overwrite the

// regular ones.

i = off_the_record_settings_.find(host);

if (i != off_the_record_settings_.end() &&

@@ -189,8 +189,8 @@ ContentSettings BaseProvider::GetNonDefaultContentSettings(

if (i != host_content_settings_.end())

output = i->second.content_settings;