Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: last comment Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_details.h"
18 #include "chrome/browser/content_settings/content_settings_observable_provider.h " 17 #include "chrome/browser/content_settings/content_settings_observable_provider.h "
19 #include "chrome/browser/content_settings/content_settings_policy_provider.h" 18 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
20 #include "chrome/browser/content_settings/content_settings_pref_provider.h" 19 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
21 #include "chrome/browser/content_settings/content_settings_provider.h"
22 #include "chrome/browser/content_settings/content_settings_rule.h"
23 #include "chrome/browser/content_settings/content_settings_utils.h" 20 #include "chrome/browser/content_settings/content_settings_utils.h"
24 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
26 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
24 #include "components/content_settings/core/browser/content_settings_details.h"
25 #include "components/content_settings/core/browser/content_settings_provider.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" 30 #include "content/public/common/content_switches.h"
31 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
32 #include "net/base/static_cookie_policy.h" 32 #include "net/base/static_cookie_policy.h"
33 #include "url/gurl.h" 33 #include "url/gurl.h"
34 34
35 #if defined(ENABLE_EXTENSIONS) 35 #if defined(ENABLE_EXTENSIONS)
36 #include "extensions/common/constants.h" 36 #include "extensions/common/constants.h"
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 } 722 }
723 723
724 NOTREACHED(); 724 NOTREACHED();
725 return DEFAULT_PROVIDER; 725 return DEFAULT_PROVIDER;
726 } 726 }
727 727
728 content_settings::PrefProvider* HostContentSettingsMap::GetPrefProvider() { 728 content_settings::PrefProvider* HostContentSettingsMap::GetPrefProvider() {
729 return static_cast<content_settings::PrefProvider*>( 729 return static_cast<content_settings::PrefProvider*>(
730 content_settings_providers_[PREF_PROVIDER]); 730 content_settings_providers_[PREF_PROVIDER]);
731 } 731 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698