OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/content_settings_pref_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_pref_provider.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "chrome/browser/browser_thread.h" | |
13 #include "chrome/browser/content_settings/content_settings_details.h" | 12 #include "chrome/browser/content_settings/content_settings_details.h" |
14 #include "chrome/browser/content_settings/content_settings_pattern.h" | 13 #include "chrome/browser/content_settings/content_settings_pattern.h" |
15 #include "chrome/browser/prefs/pref_service.h" | 14 #include "chrome/browser/prefs/pref_service.h" |
16 #include "chrome/browser/prefs/scoped_pref_update.h" | 15 #include "chrome/browser/prefs/scoped_pref_update.h" |
17 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/content_settings.h" | 18 #include "chrome/common/content_settings.h" |
20 #include "chrome/common/notification_details.h" | 19 #include "chrome/common/notification_details.h" |
21 #include "chrome/common/notification_service.h" | 20 #include "chrome/common/notification_service.h" |
22 #include "chrome/common/notification_source.h" | 21 #include "chrome/common/notification_source.h" |
23 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
| 23 #include "content/browser/browser_thread.h" |
24 #include "googleurl/src/gurl.h" | 24 #include "googleurl/src/gurl.h" |
25 #include "net/base/net_util.h" | 25 #include "net/base/net_util.h" |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 // The preference keys where resource identifiers are stored for | 29 // The preference keys where resource identifiers are stored for |
30 // ContentSettingsType values that support resource identifiers. | 30 // ContentSettingsType values that support resource identifiers. |
31 const char* kResourceTypeNames[] = { | 31 const char* kResourceTypeNames[] = { |
32 NULL, | 32 NULL, |
33 NULL, | 33 NULL, |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
763 ContentSettingsPattern(host), | 763 ContentSettingsPattern(host), |
764 CONTENT_SETTINGS_TYPE_POPUPS, | 764 CONTENT_SETTINGS_TYPE_POPUPS, |
765 "", | 765 "", |
766 CONTENT_SETTING_ALLOW); | 766 CONTENT_SETTING_ALLOW); |
767 } | 767 } |
768 prefs->ClearPref(prefs::kPopupWhitelistedHosts); | 768 prefs->ClearPref(prefs::kPopupWhitelistedHosts); |
769 } | 769 } |
770 } | 770 } |
771 | 771 |
772 } // namespace content_settings | 772 } // namespace content_settings |
OLD | NEW |