Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: components/sync/driver/sync_error_controller.h

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/driver/sync_client.cc ('k') | components/sync/driver/sync_error_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/driver/sync_error_controller.h
diff --git a/components/sync/driver/sync_error_controller.h b/components/sync/driver/sync_error_controller.h
index fcb59497e36ce023a6515ac00347add28fc96539..4aceeab644601b08c1a1a637394fcad7fd27758a 100644
--- a/components/sync/driver/sync_error_controller.h
+++ b/components/sync/driver/sync_error_controller.h
@@ -10,12 +10,12 @@
#include "base/observer_list.h"
#include "components/sync/driver/sync_service_observer.h"
-namespace syncer {
-
+namespace sync_driver {
class SyncService;
+}
// Keep track of sync errors and expose them to observers in the UI.
-class SyncErrorController : public SyncServiceObserver {
+class SyncErrorController : public sync_driver::SyncServiceObserver {
public:
// The observer class for SyncErrorController lets the controller notify
// observers when an error arises or changes.
@@ -25,7 +25,7 @@ class SyncErrorController : public SyncServiceObserver {
virtual void OnErrorChanged() = 0;
};
- explicit SyncErrorController(SyncService* service);
+ explicit SyncErrorController(sync_driver::SyncService* service);
~SyncErrorController() override;
// True if there exists an error worth elevating to the user.
@@ -34,16 +34,14 @@ class SyncErrorController : public SyncServiceObserver {
void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer);
- // SyncServiceObserver:
+ // sync_driver::SyncServiceObserver:
void OnStateChanged() override;
private:
- SyncService* service_;
+ sync_driver::SyncService* service_;
base::ObserverList<Observer, true> observer_list_;
DISALLOW_COPY_AND_ASSIGN(SyncErrorController);
};
-} // namespace syncer
-
#endif // COMPONENTS_SYNC_DRIVER_SYNC_ERROR_CONTROLLER_H_
« no previous file with comments | « components/sync/driver/sync_client.cc ('k') | components/sync/driver/sync_error_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698