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

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

Issue 6756001: Removing 'off the record' references. Contributed by vipul.bhasin@gmail.com (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removing off the record references from the code 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 | « no previous file | chrome/browser/content_settings/content_settings_base_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_base_provider.h
diff --git a/chrome/browser/content_settings/content_settings_base_provider.h b/chrome/browser/content_settings/content_settings_base_provider.h
index bbfa6e9b76f163883d36ccb0cf290f6386941001..6f3ae4db0e6c2e3f39607846e38a49ce04ddbc4a 100644
--- a/chrome/browser/content_settings/content_settings_base_provider.h
+++ b/chrome/browser/content_settings/content_settings_base_provider.h
@@ -100,16 +100,16 @@ class BaseProvider : public ProviderInterface {
return &host_content_settings_;
}
- HostContentSettings* off_the_record_settings() {
- return &off_the_record_settings_;
+ HostContentSettings* incognito_settings() {
+ return &incognito_settings_;
}
base::Lock& lock() const {
return lock_;
}
- bool is_off_the_record() const {
- return is_off_the_record_;
+ bool is_incognito() const {
+ return is_incognito_;
}
private:
@@ -118,11 +118,11 @@ class BaseProvider : public ProviderInterface {
HostContentSettings host_content_settings_;
// Whether this settings map is for an OTR session.
- bool is_off_the_record_;
+ bool is_incognito_;
// Differences to the preference-stored host content settings for
// incognito settings.
- HostContentSettings off_the_record_settings_;
+ HostContentSettings incognito_settings_;
// Used around accesses to the content_settings_ object to guarantee
// thread safety.
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_base_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698