diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome/browser/content_settings/host_content_settings_map.cc | |
parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/host_content_settings_map.cc')
-rw-r--r-- | chrome/browser/content_settings/host_content_settings_map.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 133e66f..d893d69 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -225,7 +225,7 @@ ContentSetting HostContentSettingsMap::GetNonDefaultContentSetting( return GetDefaultContentSetting(content_type); } - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); const std::string host(net::GetHostOrSpecFromURL(url)); ContentSettingsTypeResourceIdentifierPair @@ -307,7 +307,7 @@ ContentSettings HostContentSettingsMap::GetNonDefaultContentSettings( if (ShouldAllowAllContent(url)) return ContentSettings(CONTENT_SETTING_ALLOW); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); const std::string host(net::GetHostOrSpecFromURL(url)); ContentSettings output; @@ -371,7 +371,7 @@ void HostContentSettingsMap::GetSettingsForOneType( ContentSettingsTypeResourceIdentifierPair requested_setting(content_type, resource_identifier); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); for (HostContentSettings::const_iterator i(map_to_return->begin()); i != map_to_return->end(); ++i) { ContentSetting setting; @@ -446,7 +446,7 @@ void HostContentSettingsMap::SetContentSetting( } { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (!map_to_modify->count(pattern_str)) (*map_to_modify)[pattern_str].content_settings = ContentSettings(); HostContentSettings::iterator @@ -556,7 +556,7 @@ void HostContentSettingsMap::ClearSettingsForOneType( } { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); for (HostContentSettings::iterator i(map_to_modify->begin()); i != map_to_modify->end(); ) { if (RequiresResourceIdentifier(content_type) || @@ -626,7 +626,7 @@ void HostContentSettingsMap::SetBlockThirdPartyCookies(bool block) { } { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); block_third_party_cookies_ = block; } @@ -647,7 +647,7 @@ void HostContentSettingsMap::SetBlockNonsandboxedPlugins(bool block) { } { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); block_nonsandboxed_plugins_ = block; } @@ -668,7 +668,7 @@ void HostContentSettingsMap::ResetToDefaults() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); for (provider_iterator provider = content_settings_providers_.begin(); provider != content_settings_providers_.end(); ++provider) { (*provider)->ResetToDefaults(); @@ -711,14 +711,14 @@ void HostContentSettingsMap::Observe(NotificationType type, if (*name == prefs::kContentSettingsPatterns) { ReadExceptions(true); } else if (*name == prefs::kBlockThirdPartyCookies) { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); block_third_party_cookies_ = profile_->GetPrefs()->GetBoolean( prefs::kBlockThirdPartyCookies); is_block_third_party_cookies_managed_ = profile_->GetPrefs()->IsManagedPreference( prefs::kBlockThirdPartyCookies); } else if (*name == prefs::kBlockNonsandboxedPlugins) { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); block_nonsandboxed_plugins_ = profile_->GetPrefs()->GetBoolean( prefs::kBlockNonsandboxedPlugins); } else { @@ -822,7 +822,7 @@ bool HostContentSettingsMap::IsDefaultContentSettingManaged( } void HostContentSettingsMap::ReadExceptions(bool overwrite) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); PrefService* prefs = profile_->GetPrefs(); DictionaryValue* all_settings_dictionary = |