| 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/host_content_settings_map.h" | 5 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "base/time/clock.h" | 15 #include "base/time/clock.h" |
| 16 #include "chrome/browser/content_settings/content_settings_default_provider.h" | 16 #include "chrome/browser/content_settings/content_settings_default_provider.h" |
| 17 #include "chrome/browser/content_settings/content_settings_policy_provider.h" | 17 #include "chrome/browser/content_settings/content_settings_policy_provider.h" |
| 18 #include "chrome/browser/content_settings/content_settings_pref_provider.h" | 18 #include "chrome/browser/content_settings/content_settings_pref_provider.h" |
| 19 #include "chrome/browser/content_settings/content_settings_utils.h" | 19 #include "chrome/browser/content_settings/content_settings_utils.h" |
| 20 #include "chrome/common/chrome_switches.h" | 20 #include "chrome/common/chrome_switches.h" |
| 21 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
| 22 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
| 23 #include "components/content_settings/core/browser/content_settings_details.h" | 23 #include "components/content_settings/core/browser/content_settings_details.h" |
| 24 #include "components/content_settings/core/browser/content_settings_observable_p
rovider.h" | 24 #include "components/content_settings/core/browser/content_settings_observable_p
rovider.h" |
| 25 #include "components/content_settings/core/browser/content_settings_provider.h" | 25 #include "components/content_settings/core/browser/content_settings_provider.h" |
| 26 #include "components/content_settings/core/browser/content_settings_rule.h" | 26 #include "components/content_settings/core/browser/content_settings_rule.h" |
| 27 #include "components/content_settings/core/common/content_settings_pattern.h" | 27 #include "components/content_settings/core/common/content_settings_pattern.h" |
| 28 #include "components/pref_registry/pref_registry_syncable.h" | 28 #include "components/pref_registry/pref_registry_syncable.h" |
| 29 #include "content/public/browser/browser_thread.h" | 29 #include "content/public/browser/browser_thread.h" |
| 30 #include "content/public/common/content_switches.h" | |
| 31 #include "net/base/net_errors.h" | 30 #include "net/base/net_errors.h" |
| 32 #include "net/base/static_cookie_policy.h" | 31 #include "net/base/static_cookie_policy.h" |
| 33 #include "url/gurl.h" | 32 #include "url/gurl.h" |
| 34 | 33 |
| 35 #if defined(ENABLE_EXTENSIONS) | 34 #if defined(ENABLE_EXTENSIONS) |
| 36 #include "extensions/common/constants.h" | 35 #include "extensions/common/constants.h" |
| 37 #endif | 36 #endif |
| 38 | 37 |
| 39 using content::BrowserThread; | 38 using content::BrowserThread; |
| 40 | 39 |
| (...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 } | 800 } |
| 802 } | 801 } |
| 803 | 802 |
| 804 if (info) { | 803 if (info) { |
| 805 info->source = content_settings::SETTING_SOURCE_NONE; | 804 info->source = content_settings::SETTING_SOURCE_NONE; |
| 806 info->primary_pattern = ContentSettingsPattern(); | 805 info->primary_pattern = ContentSettingsPattern(); |
| 807 info->secondary_pattern = ContentSettingsPattern(); | 806 info->secondary_pattern = ContentSettingsPattern(); |
| 808 } | 807 } |
| 809 return scoped_ptr<base::Value>(); | 808 return scoped_ptr<base::Value>(); |
| 810 } | 809 } |
| OLD | NEW |