summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/pref_notifier_impl.h4
-rw-r--r--chrome/browser/prefs/pref_service.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/prefs/pref_notifier_impl.h b/chrome/browser/prefs/pref_notifier_impl.h
index 1d61830..085e547 100644
--- a/chrome/browser/prefs/pref_notifier_impl.h
+++ b/chrome/browser/prefs/pref_notifier_impl.h
@@ -9,8 +9,8 @@
#include <string>
#include "base/hash_tables.h"
-#include "base/non_thread_safe.h"
#include "base/observer_list.h"
+#include "base/threading/non_thread_safe.h"
#include "chrome/browser/prefs/pref_notifier.h"
class PrefService;
@@ -18,7 +18,7 @@ class NotificationObserver;
// The PrefNotifier implementation used by the PrefService.
class PrefNotifierImpl : public PrefNotifier,
- public NonThreadSafe {
+ public base::NonThreadSafe {
public:
explicit PrefNotifierImpl(PrefService* pref_service);
virtual ~PrefNotifierImpl();
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h
index 5485292..f17bbbd 100644
--- a/chrome/browser/prefs/pref_service.h
+++ b/chrome/browser/prefs/pref_service.h
@@ -11,9 +11,9 @@
#include <set>
#include <string>
-#include "base/non_thread_safe.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
+#include "base/threading/non_thread_safe.h"
#include "base/values.h"
class DefaultPrefStore;
@@ -31,7 +31,7 @@ namespace subtle {
class PrefMemberBase;
};
-class PrefService : public NonThreadSafe {
+class PrefService : public base::NonThreadSafe {
public:
// A helper class to store all the information associated with a preference.
class Preference {