diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 04:48:49 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 04:48:49 +0000 |
| commit | c91775096768e4a75b23a910ddc1e33d9412a3be (patch) | |
| tree | cb807f9b28d88b4950e41d32fbe73a5c81a94c40 /chrome/browser/prefs | |
| parent | e0eb450f398ae888aa0fbdb7fd3abc072d5846a2 (diff) | |
| download | chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.zip chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.tar.gz chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.tar.bz2 | |
Move non_thread_safe from base to base/threading and into the base namespace.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6005010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_notifier_impl.h | 4 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_service.h | 4 |
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 { |