| 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 "chrome/browser/content_settings/content_settings_rule.h" | 15 #include "chrome/browser/content_settings/content_settings_rule.h" |
| 15 #include "chrome/browser/content_settings/content_settings_utils.h" | 16 #include "chrome/browser/content_settings/content_settings_utils.h" |
| 16 #include "chrome/browser/prefs/pref_registry_syncable.h" | 17 #include "chrome/browser/prefs/pref_registry_syncable.h" |
| 17 #include "chrome/browser/prefs/pref_service.h" | |
| 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 18 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 19 #include "chrome/common/chrome_notification_types.h" | 19 #include "chrome/common/chrome_notification_types.h" |
| 20 #include "chrome/common/content_settings.h" | 20 #include "chrome/common/content_settings.h" |
| 21 #include "chrome/common/content_settings_pattern.h" | 21 #include "chrome/common/content_settings_pattern.h" |
| 22 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.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 "googleurl/src/gurl.h" | 27 #include "googleurl/src/gurl.h" |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 // Migrate obsolete cookie prompt mode. | 326 // Migrate obsolete cookie prompt mode. |
| 327 if (ValueToContentSetting( | 327 if (ValueToContentSetting( |
| 328 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == | 328 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) == |
| 329 CONTENT_SETTING_ASK) { | 329 CONTENT_SETTING_ASK) { |
| 330 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( | 330 default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset( |
| 331 Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); | 331 Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); |
| 332 } | 332 } |
| 333 } | 333 } |
| 334 | 334 |
| 335 } // namespace content_settings | 335 } // namespace content_settings |
| OLD | NEW |