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

Side by Side Diff: chrome/browser/content_settings/content_settings_pref_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
7 #pragma once 7 #pragma once
8 8
9 // A content settings provider that takes its settings out of the pref service. 9 // A content settings provider that takes its settings out of the pref service.
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 // true and the preference is missing, the local copy will be cleared as well. 69 // true and the preference is missing, the local copy will be cleared as well.
70 void ReadDefaultSettings(bool overwrite); 70 void ReadDefaultSettings(bool overwrite);
71 71
72 void MigrateObsoleteNotificationPref(PrefService* prefs); 72 void MigrateObsoleteNotificationPref(PrefService* prefs);
73 73
74 // Copies of the pref data, so that we can read it on the IO thread. 74 // Copies of the pref data, so that we can read it on the IO thread.
75 ContentSettings default_content_settings_; 75 ContentSettings default_content_settings_;
76 76
77 Profile* profile_; 77 Profile* profile_;
78 78
79 // Whether this settings map is for an OTR session. 79 // Whether this settings map is for an Incognito session.
80 bool is_off_the_record_; 80 bool is_incognito_;
81 81
82 // Used around accesses to the default_content_settings_ object to guarantee 82 // Used around accesses to the default_content_settings_ object to guarantee
83 // thread safety. 83 // thread safety.
84 mutable base::Lock lock_; 84 mutable base::Lock lock_;
85 85
86 PrefChangeRegistrar pref_change_registrar_; 86 PrefChangeRegistrar pref_change_registrar_;
87 NotificationRegistrar notification_registrar_; 87 NotificationRegistrar notification_registrar_;
88 88
89 // Whether we are currently updating preferences, this is used to ignore 89 // Whether we are currently updating preferences, this is used to ignore
90 // notifications from the preferences service that we triggered ourself. 90 // notifications from the preferences service that we triggered ourself.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 // Do not fire any Notifications as long as we are in the constructor. 164 // Do not fire any Notifications as long as we are in the constructor.
165 bool initializing_; 165 bool initializing_;
166 166
167 DISALLOW_COPY_AND_ASSIGN(PrefProvider); 167 DISALLOW_COPY_AND_ASSIGN(PrefProvider);
168 }; 168 };
169 169
170 } // namespace content_settings 170 } // namespace content_settings
171 171
172 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ 172 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698