Index: chrome/browser/sync/glue/bridged_sync_notifier.h |
diff --git a/chrome/browser/sync/notifier/bridged_sync_notifier.h b/chrome/browser/sync/glue/bridged_sync_notifier.h |
similarity index 73% |
rename from chrome/browser/sync/notifier/bridged_sync_notifier.h |
rename to chrome/browser/sync/glue/bridged_sync_notifier.h |
index a7cbedb30e36affe827a7b96f7a3ff200d0e4e7b..d758597175118b6fb3c1b565f4feb66d39d94797 100644 |
--- a/chrome/browser/sync/notifier/bridged_sync_notifier.h |
+++ b/chrome/browser/sync/glue/bridged_sync_notifier.h |
@@ -2,14 +2,14 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_SYNC_NOTIFIER_BRIDGED_SYNC_NOTIFIER_H_ |
-#define CHROME_BROWSER_SYNC_NOTIFIER_BRIDGED_SYNC_NOTIFIER_H_ |
+#ifndef CHROME_BROWSER_SYNC_GLUE_BRIDGED_SYNC_NOTIFIER_H_ |
+#define CHROME_BROWSER_SYNC_GLUE_BRIDGED_SYNC_NOTIFIER_H_ |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/sync/notifier/sync_notifier.h" |
-namespace sync_notifier { |
+namespace browser_sync { |
class ChromeSyncNotificationBridge; |
@@ -18,18 +18,20 @@ class ChromeSyncNotificationBridge; |
// calls are passed straight through to the delegate, with the exception of |
// AddObserver/RemoveObserver, which also result in the observer being |
// registered/deregistered with the ChromeSyncNotificationBridge. |
-class BridgedSyncNotifier : public SyncNotifier { |
+class BridgedSyncNotifier : public sync_notifier::SyncNotifier { |
public: |
// Does not take ownership of |bridge|. Takes ownership of |delegate|. |
BridgedSyncNotifier(ChromeSyncNotificationBridge* bridge, |
- SyncNotifier* delegate); |
+ sync_notifier::SyncNotifier* delegate); |
virtual ~BridgedSyncNotifier(); |
// SyncNotifier implementation. Passes through all calls to the delegate. |
// AddObserver/RemoveObserver will also register/deregister |observer| with |
// the bridge. |
- virtual void AddObserver(SyncNotifierObserver* observer) OVERRIDE; |
- virtual void RemoveObserver(SyncNotifierObserver* observer) OVERRIDE; |
+ virtual void AddObserver( |
+ sync_notifier::SyncNotifierObserver* observer) OVERRIDE; |
+ virtual void RemoveObserver( |
+ sync_notifier::SyncNotifierObserver* observer) OVERRIDE; |
virtual void SetUniqueId(const std::string& unique_id) OVERRIDE; |
virtual void SetState(const std::string& state) OVERRIDE; |
virtual void UpdateCredentials( |
@@ -44,9 +46,9 @@ class BridgedSyncNotifier : public SyncNotifier { |
ChromeSyncNotificationBridge* bridge_; |
// The delegate we are wrapping. |
- scoped_ptr<SyncNotifier> delegate_; |
+ scoped_ptr<sync_notifier::SyncNotifier> delegate_; |
}; |
-} // namespace sync_notifier |
+} // namespace browser_sync |
-#endif // CHROME_BROWSER_SYNC_NOTIFIER_BRIDGED_SYNC_NOTIFIER_H_ |
+#endif // CHROME_BROWSER_SYNC_GLUE_BRIDGED_SYNC_NOTIFIER_H_ |