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

Side by Side Diff: chrome/browser/content_settings/content_settings_pref_provider.h

Issue 7328018: Migrate default geolocation content setting to host content settings map. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 5 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 // Forces the default settings to be explicitly set instead of themselves 64 // Forces the default settings to be explicitly set instead of themselves
65 // being CONTENT_SETTING_DEFAULT. 65 // being CONTENT_SETTING_DEFAULT.
66 void ForceDefaultsToBeExplicit(); 66 void ForceDefaultsToBeExplicit();
67 67
68 // Reads the default settings from the preferences service. If |overwrite| is 68 // Reads the default settings from the preferences service. If |overwrite| is
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(); 72 void MigrateObsoleteNotificationPref();
73 void MigrateObsoleteGeolocationPref();
73 74
74 // Copies of the pref data, so that we can read it on the IO thread. 75 // Copies of the pref data, so that we can read it on the IO thread.
75 ContentSettings default_content_settings_; 76 ContentSettings default_content_settings_;
76 77
77 PrefService* prefs_; 78 PrefService* prefs_;
78 79
79 // Whether this settings map is for an Incognito session. 80 // Whether this settings map is for an Incognito session.
80 bool is_incognito_; 81 bool is_incognito_;
81 82
82 // Used around accesses to the default_content_settings_ object to guarantee 83 // Used around accesses to the default_content_settings_ object to guarantee
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // Used around accesses to the value map objects to guarantee 202 // Used around accesses to the value map objects to guarantee
202 // thread safety. 203 // thread safety.
203 mutable base::Lock lock_; 204 mutable base::Lock lock_;
204 205
205 DISALLOW_COPY_AND_ASSIGN(PrefProvider); 206 DISALLOW_COPY_AND_ASSIGN(PrefProvider);
206 }; 207 };
207 208
208 } // namespace content_settings 209 } // namespace content_settings
209 210
210 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ 211 #endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698