OLD | NEW |
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 #include "chrome/browser/content_settings/host_content_settings_map.h" | 5 #include "chrome/browser/content_settings/host_content_settings_map.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/browser/content_settings/content_settings_details.h" |
12 #include "chrome/browser/content_settings/content_settings_extension_provider.h" | 13 #include "chrome/browser/content_settings/content_settings_extension_provider.h" |
| 14 #include "chrome/browser/content_settings/content_settings_observable_provider.h
" |
13 #include "chrome/browser/content_settings/content_settings_policy_provider.h" | 15 #include "chrome/browser/content_settings/content_settings_policy_provider.h" |
14 #include "chrome/browser/content_settings/content_settings_pref_provider.h" | 16 #include "chrome/browser/content_settings/content_settings_pref_provider.h" |
15 #include "chrome/browser/content_settings/content_settings_provider.h" | 17 #include "chrome/browser/content_settings/content_settings_provider.h" |
16 #include "chrome/browser/content_settings/content_settings_utils.h" | 18 #include "chrome/browser/content_settings/content_settings_utils.h" |
17 #include "chrome/browser/extensions/extension_service.h" | 19 #include "chrome/browser/extensions/extension_service.h" |
18 #include "chrome/browser/prefs/pref_service.h" | 20 #include "chrome/browser/prefs/pref_service.h" |
19 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 21 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
20 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/common/chrome_notification_types.h" | 23 #include "chrome/common/chrome_notification_types.h" |
22 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
(...skipping 25 matching lines...) Expand all Loading... |
48 typedef std::vector<DefaultContentSettingsProviderPtr>::iterator | 50 typedef std::vector<DefaultContentSettingsProviderPtr>::iterator |
49 DefaultProviderIterator; | 51 DefaultProviderIterator; |
50 typedef std::vector<DefaultContentSettingsProviderPtr>::const_iterator | 52 typedef std::vector<DefaultContentSettingsProviderPtr>::const_iterator |
51 ConstDefaultProviderIterator; | 53 ConstDefaultProviderIterator; |
52 | 54 |
53 typedef linked_ptr<content_settings::ProviderInterface> ProviderPtr; | 55 typedef linked_ptr<content_settings::ProviderInterface> ProviderPtr; |
54 typedef std::vector<ProviderPtr>::iterator ProviderIterator; | 56 typedef std::vector<ProviderPtr>::iterator ProviderIterator; |
55 typedef std::vector<ProviderPtr>::const_iterator ConstProviderIterator; | 57 typedef std::vector<ProviderPtr>::const_iterator ConstProviderIterator; |
56 | 58 |
57 typedef content_settings::ProviderInterface::Rules Rules; | 59 typedef content_settings::ProviderInterface::Rules Rules; |
58 typedef content_settings::ProviderInterface::Rules::iterator | |
59 rules_iterator; | |
60 typedef content_settings::ProviderInterface::Rules::const_iterator | |
61 const_rules_iterator; | |
62 | 60 |
63 const char* kProviderNames[] = { | 61 const char* kProviderNames[] = { |
64 "policy", | 62 "policy", |
65 "extension", | 63 "extension", |
66 "preference" | 64 "preference" |
67 }; | 65 }; |
68 | 66 |
69 } // namespace | 67 } // namespace |
70 | 68 |
71 HostContentSettingsMap::HostContentSettingsMap( | 69 HostContentSettingsMap::HostContentSettingsMap( |
(...skipping 30 matching lines...) Expand all Loading... |
102 UserMetrics::RecordAction( | 100 UserMetrics::RecordAction( |
103 UserMetricsAction("ThirdPartyCookieBlockingDisabled")); | 101 UserMetricsAction("ThirdPartyCookieBlockingDisabled")); |
104 } | 102 } |
105 is_block_third_party_cookies_managed_ = | 103 is_block_third_party_cookies_managed_ = |
106 prefs_->IsManagedPreference(prefs::kBlockThirdPartyCookies); | 104 prefs_->IsManagedPreference(prefs::kBlockThirdPartyCookies); |
107 | 105 |
108 // User defined non default content settings are provided by the PrefProvider. | 106 // User defined non default content settings are provided by the PrefProvider. |
109 // The order in which the content settings providers are created is critical, | 107 // The order in which the content settings providers are created is critical, |
110 // as providers that are further up in the list (i.e. added earlier) override | 108 // as providers that are further up in the list (i.e. added earlier) override |
111 // providers further down. | 109 // providers further down. |
112 content_settings_providers_.push_back(make_linked_ptr( | 110 content_settings::ObservableProvider* provider = |
113 new content_settings::PolicyProvider(this, | 111 new content_settings::PolicyProvider(prefs_, policy_default_provider); |
114 prefs_, | 112 provider->AddObserver(this); |
115 policy_default_provider))); | 113 content_settings_providers_.push_back(make_linked_ptr(provider)); |
| 114 |
116 if (extension_service) { | 115 if (extension_service) { |
117 // |extension_service| can be NULL in unit tests. | 116 // |extension_service| can be NULL in unit tests. |
118 content_settings_providers_.push_back(make_linked_ptr( | 117 provider = new content_settings::ExtensionProvider( |
119 new content_settings::ExtensionProvider( | 118 extension_service->GetExtensionContentSettingsStore(), |
120 this, | 119 is_off_the_record_); |
121 extension_service->GetExtensionContentSettingsStore(), | 120 provider->AddObserver(this); |
122 is_off_the_record_))); | 121 content_settings_providers_.push_back(make_linked_ptr(provider)); |
123 } | 122 } |
124 content_settings_providers_.push_back(make_linked_ptr( | 123 provider = new content_settings::PrefProvider(prefs_, is_off_the_record_); |
125 new content_settings::PrefProvider(this, prefs_, is_off_the_record_))); | 124 provider->AddObserver(this); |
| 125 content_settings_providers_.push_back(make_linked_ptr(provider)); |
126 | 126 |
127 pref_change_registrar_.Init(prefs_); | 127 pref_change_registrar_.Init(prefs_); |
128 pref_change_registrar_.Add(prefs::kBlockThirdPartyCookies, this); | 128 pref_change_registrar_.Add(prefs::kBlockThirdPartyCookies, this); |
129 } | 129 } |
130 | 130 |
131 // static | 131 // static |
132 void HostContentSettingsMap::RegisterUserPrefs(PrefService* prefs) { | 132 void HostContentSettingsMap::RegisterUserPrefs(PrefService* prefs) { |
133 prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies, | 133 prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies, |
134 false, | 134 false, |
135 PrefService::SYNCABLE_PREF); | 135 PrefService::SYNCABLE_PREF); |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
440 } | 440 } |
441 | 441 |
442 { | 442 { |
443 base::AutoLock auto_lock(lock_); | 443 base::AutoLock auto_lock(lock_); |
444 block_third_party_cookies_ = block; | 444 block_third_party_cookies_ = block; |
445 } | 445 } |
446 | 446 |
447 prefs_->SetBoolean(prefs::kBlockThirdPartyCookies, block); | 447 prefs_->SetBoolean(prefs::kBlockThirdPartyCookies, block); |
448 } | 448 } |
449 | 449 |
| 450 void HostContentSettingsMap::OnContentSettingChanged( |
| 451 ContentSettingsPattern primary_pattern, |
| 452 ContentSettingsPattern secondary_pattern, |
| 453 ContentSettingsType content_type, |
| 454 std::string resource_identifier) { |
| 455 const ContentSettingsDetails details(primary_pattern, |
| 456 secondary_pattern, |
| 457 content_type, |
| 458 resource_identifier); |
| 459 NotificationService::current()->Notify( |
| 460 chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED, |
| 461 Source<HostContentSettingsMap>(this), |
| 462 Details<const ContentSettingsDetails>(&details)); |
| 463 } |
| 464 |
450 void HostContentSettingsMap::Observe(int type, | 465 void HostContentSettingsMap::Observe(int type, |
451 const NotificationSource& source, | 466 const NotificationSource& source, |
452 const NotificationDetails& details) { | 467 const NotificationDetails& details) { |
453 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 468 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
454 | 469 |
455 if (type == chrome::NOTIFICATION_PREF_CHANGED) { | 470 if (type == chrome::NOTIFICATION_PREF_CHANGED) { |
456 DCHECK_EQ(prefs_, Source<PrefService>(source).ptr()); | 471 DCHECK_EQ(prefs_, Source<PrefService>(source).ptr()); |
457 if (updating_preferences_) | 472 if (updating_preferences_) |
458 return; | 473 return; |
459 | 474 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
514 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, | 529 SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, |
515 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ? | 530 (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ? |
516 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW); | 531 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW); |
517 } | 532 } |
518 if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) { | 533 if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) { |
519 SetBlockThirdPartyCookies(cookie_behavior == | 534 SetBlockThirdPartyCookies(cookie_behavior == |
520 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES); | 535 net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES); |
521 } | 536 } |
522 } | 537 } |
523 } | 538 } |
OLD | NEW |