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

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

Issue 220353002: Remove //chrome dependency from ExtensionPrefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't ref ContentSettingsStore if !ENABLE_EXTENSIONS Created 6 years, 8 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 | Annotate | Revision Log
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 "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h" 16 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h"
17 #include "chrome/browser/content_settings/content_settings_default_provider.h" 17 #include "chrome/browser/content_settings/content_settings_default_provider.h"
18 #include "chrome/browser/content_settings/content_settings_details.h" 18 #include "chrome/browser/content_settings/content_settings_details.h"
19 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h" 19 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"
20 #include "chrome/browser/content_settings/content_settings_observable_provider.h " 20 #include "chrome/browser/content_settings/content_settings_observable_provider.h "
21 #include "chrome/browser/content_settings/content_settings_policy_provider.h" 21 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
22 #include "chrome/browser/content_settings/content_settings_pref_provider.h" 22 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
23 #include "chrome/browser/content_settings/content_settings_provider.h" 23 #include "chrome/browser/content_settings/content_settings_provider.h"
24 #include "chrome/browser/content_settings/content_settings_rule.h" 24 #include "chrome/browser/content_settings/content_settings_rule.h"
25 #include "chrome/browser/content_settings/content_settings_utils.h" 25 #include "chrome/browser/content_settings/content_settings_utils.h"
26 #include "chrome/browser/extensions/api/content_settings/content_settings_servic e.h"
26 #include "chrome/browser/extensions/extension_service.h" 27 #include "chrome/browser/extensions/extension_service.h"
27 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/content_settings_pattern.h" 29 #include "chrome/common/content_settings_pattern.h"
29 #include "chrome/common/pref_names.h" 30 #include "chrome/common/pref_names.h"
30 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
31 #include "components/user_prefs/pref_registry_syncable.h" 32 #include "components/user_prefs/pref_registry_syncable.h"
32 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
33 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
34 #include "content/public/browser/notification_source.h" 35 #include "content/public/browser/notification_source.h"
35 #include "content/public/browser/user_metrics.h" 36 #include "content/public/browser/user_metrics.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 DCHECK(!content_settings_providers_[CUSTOM_EXTENSION_PROVIDER]); 114 DCHECK(!content_settings_providers_[CUSTOM_EXTENSION_PROVIDER]);
114 115
115 content_settings::InternalExtensionProvider* internal_extension_provider = 116 content_settings::InternalExtensionProvider* internal_extension_provider =
116 new content_settings::InternalExtensionProvider(extension_service); 117 new content_settings::InternalExtensionProvider(extension_service);
117 internal_extension_provider->AddObserver(this); 118 internal_extension_provider->AddObserver(this);
118 content_settings_providers_[INTERNAL_EXTENSION_PROVIDER] = 119 content_settings_providers_[INTERNAL_EXTENSION_PROVIDER] =
119 internal_extension_provider; 120 internal_extension_provider;
120 121
121 content_settings::ObservableProvider* custom_extension_provider = 122 content_settings::ObservableProvider* custom_extension_provider =
122 new content_settings::CustomExtensionProvider( 123 new content_settings::CustomExtensionProvider(
123 extensions::ExtensionPrefs::Get( 124 extensions::ContentSettingsService::Get(
124 extension_service->GetBrowserContext())->content_settings_store(), 125 extension_service->GetBrowserContext())->content_settings_store(),
125 is_off_the_record_); 126 is_off_the_record_);
126 custom_extension_provider->AddObserver(this); 127 custom_extension_provider->AddObserver(this);
127 content_settings_providers_[CUSTOM_EXTENSION_PROVIDER] = 128 content_settings_providers_[CUSTOM_EXTENSION_PROVIDER] =
128 custom_extension_provider; 129 custom_extension_provider;
129 130
130 #ifndef NDEBUG 131 #ifndef NDEBUG
131 DCHECK(used_from_thread_id_ != base::kInvalidThreadId) 132 DCHECK(used_from_thread_id_ != base::kInvalidThreadId)
132 << "Used from multiple threads before initialization complete."; 133 << "Used from multiple threads before initialization complete.";
133 #endif 134 #endif
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 HostContentSettingsMap::GetProviderTypeFromSource( 631 HostContentSettingsMap::GetProviderTypeFromSource(
631 const std::string& source) { 632 const std::string& source) {
632 for (size_t i = 0; i < arraysize(kProviderNames); ++i) { 633 for (size_t i = 0; i < arraysize(kProviderNames); ++i) {
633 if (source == kProviderNames[i]) 634 if (source == kProviderNames[i])
634 return static_cast<ProviderType>(i); 635 return static_cast<ProviderType>(i);
635 } 636 }
636 637
637 NOTREACHED(); 638 NOTREACHED();
638 return DEFAULT_PROVIDER; 639 return DEFAULT_PROVIDER;
639 } 640 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698