OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_default_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_default_provider.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/metrics/histogram.h" | 13 #include "base/metrics/histogram.h" |
14 #include "base/prefs/pref_service.h" | 14 #include "base/prefs/pref_service.h" |
15 #include "base/prefs/scoped_user_pref_update.h" | 15 #include "base/prefs/scoped_user_pref_update.h" |
16 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
17 #include "chrome/browser/content_settings/content_settings_rule.h" | |
18 #include "chrome/browser/content_settings/content_settings_utils.h" | 17 #include "chrome/browser/content_settings/content_settings_utils.h" |
19 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
| 19 #include "components/content_settings/core/browser/content_settings_rule.h" |
20 #include "components/content_settings/core/common/content_settings.h" | 20 #include "components/content_settings/core/common/content_settings.h" |
21 #include "components/content_settings/core/common/content_settings_pattern.h" | 21 #include "components/content_settings/core/common/content_settings_pattern.h" |
22 #include "components/pref_registry/pref_registry_syncable.h" | 22 #include "components/pref_registry/pref_registry_syncable.h" |
23 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
24 #include "content/public/browser/notification_details.h" | 24 #include "content/public/browser/notification_details.h" |
25 #include "content/public/browser/notification_source.h" | 25 #include "content/public/browser/notification_source.h" |
26 #include "content/public/browser/user_metrics.h" | 26 #include "content/public/browser/user_metrics.h" |
27 #include "url/gurl.h" | 27 #include "url/gurl.h" |
28 | 28 |
29 using base::UserMetricsAction; | 29 using base::UserMetricsAction; |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 // Migrate obsolete cookie prompt mode. | 340 // Migrate obsolete cookie prompt mode. |
341 if (ValueToContentSetting( | 341 if (ValueToContentSetting( |
342 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == | 342 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == |
343 CONTENT_SETTING_ASK) { | 343 CONTENT_SETTING_ASK) { |
344 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( | 344 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( |
345 new base::FundamentalValue(CONTENT_SETTING_BLOCK)); | 345 new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
346 } | 346 } |
347 } | 347 } |
348 | 348 |
349 } // namespace content_settings | 349 } // namespace content_settings |
OLD | NEW |