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/sync/glue | |
| 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/sync/glue')
| -rw-r--r-- | chrome/browser/sync/glue/session_model_associator.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/sync/glue/session_model_associator.h b/chrome/browser/sync/glue/session_model_associator.h index 502af18..f2909af 100644 --- a/chrome/browser/sync/glue/session_model_associator.h +++ b/chrome/browser/sync/glue/session_model_associator.h @@ -13,6 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/observer_list.h" #include "base/scoped_vector.h" +#include "base/threading/non_thread_safe.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sync/engine/syncapi.h" @@ -44,8 +45,10 @@ static const char kSessionsTag[] = "google_chrome_sessions"; // that gets overwritten everytime there is an update. From it, we build a new // foreign session windows list each time |GetSessionData| is called by the // ForeignSessionHandler. -class SessionModelAssociator : public PerDataTypeAssociatorInterface< - sync_pb::SessionSpecifics, std::string>, public NonThreadSafe { +class SessionModelAssociator + : public PerDataTypeAssociatorInterface<sync_pb::SessionSpecifics, + std::string>, + public base::NonThreadSafe { public: // Does not take ownership of sync_service. @@ -60,7 +63,7 @@ class SessionModelAssociator : public PerDataTypeAssociatorInterface< // Dummy method, we do everything all-at-once in UpdateFromSyncModel. virtual void Associate(const sync_pb::SessionSpecifics* specifics, - int64 sync_id) { + int64 sync_id) { } // Updates the sync model with the local client data. (calls |