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

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

Issue 596613002: Remove content dependencies from content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: browser_tests fix Created 6 years, 2 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 // Maps hostnames to custom content settings. Written on the UI thread and read 5 // Maps hostnames to custom content settings. Written on the UI thread and read
6 // on any thread. One instance per profile. 6 // on any thread. One instance per profile.
7 7
8 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_ 8 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
9 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_ 9 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
10 10
11 #include <map> 11 #include <map>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/basictypes.h" 15 #include "base/basictypes.h"
16 #include "base/memory/ref_counted.h" 16 #include "base/memory/ref_counted.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "base/prefs/pref_change_registrar.h" 18 #include "base/prefs/pref_change_registrar.h"
19 #include "base/threading/platform_thread.h" 19 #include "base/threading/platform_thread.h"
20 #include "base/threading/thread_checker.h"
20 #include "base/tuple.h" 21 #include "base/tuple.h"
21 #include "chrome/browser/content_settings/content_settings_override_provider.h" 22 #include "chrome/browser/content_settings/content_settings_override_provider.h"
22 #include "components/content_settings/core/browser/content_settings_observer.h" 23 #include "components/content_settings/core/browser/content_settings_observer.h"
23 #include "components/content_settings/core/common/content_settings.h" 24 #include "components/content_settings/core/common/content_settings.h"
24 #include "components/content_settings/core/common/content_settings_pattern.h" 25 #include "components/content_settings/core/common/content_settings_pattern.h"
25 #include "components/content_settings/core/common/content_settings_types.h" 26 #include "components/content_settings/core/common/content_settings_types.h"
26 27
27 class ExtensionService; 28 class ExtensionService;
28 class GURL; 29 class GURL;
29 class PrefService; 30 class PrefService;
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 // Whether this settings map is for an OTR session. 350 // Whether this settings map is for an OTR session.
350 bool is_off_the_record_; 351 bool is_off_the_record_;
351 352
352 // Content setting providers. This is only modified at construction 353 // Content setting providers. This is only modified at construction
353 // time and by RegisterExtensionService, both of which should happen 354 // time and by RegisterExtensionService, both of which should happen
354 // before any other uses of it. 355 // before any other uses of it.
355 ProviderMap content_settings_providers_; 356 ProviderMap content_settings_providers_;
356 357
357 ObserverList<content_settings::Observer> observers_; 358 ObserverList<content_settings::Observer> observers_;
358 359
360 base::ThreadChecker thread_checker_;
361
359 DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap); 362 DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
360 }; 363 };
361 364
362 #endif // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_ 365 #endif // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698