| 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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ |    5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ | 
|    6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ |    6 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ | 
|    7  |    7  | 
|    8 // A content settings provider that takes its settings out of the pref service. |    8 // A content settings provider that takes its settings out of the pref service. | 
|    9  |    9  | 
|   10 #include <vector> |   10 #include <vector> | 
|   11  |   11  | 
|   12 #include "base/basictypes.h" |   12 #include "base/basictypes.h" | 
|   13 #include "base/synchronization/lock.h" |   13 #include "base/synchronization/lock.h" | 
 |   14 #include "chrome/browser/api/prefs/pref_change_registrar.h" | 
 |   15 #include "chrome/browser/content_settings/content_settings_observable_provider.h
     " | 
|   14 #include "chrome/browser/content_settings/content_settings_origin_identifier_val
     ue_map.h" |   16 #include "chrome/browser/content_settings/content_settings_origin_identifier_val
     ue_map.h" | 
|   15 #include "chrome/browser/content_settings/content_settings_observable_provider.h
     " |  | 
|   16 #include "chrome/browser/content_settings/content_settings_utils.h" |   17 #include "chrome/browser/content_settings/content_settings_utils.h" | 
|   17 #include "chrome/browser/prefs/pref_change_registrar.h" |  | 
|   18 #include "content/public/browser/notification_observer.h" |   18 #include "content/public/browser/notification_observer.h" | 
|   19 #include "content/public/browser/notification_registrar.h" |   19 #include "content/public/browser/notification_registrar.h" | 
|   20  |   20  | 
|   21 class PrefService; |   21 class PrefService; | 
|   22  |   22  | 
|   23 namespace base { |   23 namespace base { | 
|   24 class DictionaryValue; |   24 class DictionaryValue; | 
|   25 } |   25 } | 
|   26  |   26  | 
|   27 namespace content_settings { |   27 namespace content_settings { | 
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  117  |  117  | 
|  118   // Used around accesses to the value map objects to guarantee thread safety. |  118   // Used around accesses to the value map objects to guarantee thread safety. | 
|  119   mutable base::Lock lock_; |  119   mutable base::Lock lock_; | 
|  120  |  120  | 
|  121   DISALLOW_COPY_AND_ASSIGN(PrefProvider); |  121   DISALLOW_COPY_AND_ASSIGN(PrefProvider); | 
|  122 }; |  122 }; | 
|  123  |  123  | 
|  124 }  // namespace content_settings |  124 }  // namespace content_settings | 
|  125  |  125  | 
|  126 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ |  126 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_ | 
| OLD | NEW |