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

Unified Diff: chrome/browser/sync/sync_global_error.h

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. 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 | « chrome/browser/sync/sync_error_notifier_factory_ash.cc ('k') | chrome/browser/sync/sync_global_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_global_error.h
diff --git a/chrome/browser/sync/sync_global_error.h b/chrome/browser/sync/sync_global_error.h
index 7b0258f97add728f5e26e08fde4f9b5ce39e1936..cf801bbb6e89fdfc367a26a673ec552946c96fe7 100644
--- a/chrome/browser/sync/sync_global_error.h
+++ b/chrome/browser/sync/sync_global_error.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_
#define CHROME_BROWSER_SYNC_SYNC_GLOBAL_ERROR_H_
+#include <vector>
+
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "chrome/browser/ui/global_error/global_error.h"
@@ -20,12 +22,12 @@ class ProfileSyncService;
// Shows sync errors on the wrench menu using a bubble view and a menu item.
class SyncGlobalError : public GlobalErrorWithStandardBubble,
- public SyncErrorController::Observer,
+ public syncer::SyncErrorController::Observer,
public KeyedService {
public:
SyncGlobalError(GlobalErrorService* global_error_service,
LoginUIService* login_ui_service,
- SyncErrorController* error_controller,
+ syncer::SyncErrorController* error_controller,
browser_sync::ProfileSyncService* profile_sync_service);
~SyncGlobalError() override;
@@ -46,7 +48,7 @@ class SyncGlobalError : public GlobalErrorWithStandardBubble,
void BubbleViewAcceptButtonPressed(Browser* browser) override;
void BubbleViewCancelButtonPressed(Browser* browser) override;
- // SyncErrorController::Observer:
+ // syncer::SyncErrorController::Observer:
void OnErrorChanged() override;
private:
@@ -60,7 +62,7 @@ class SyncGlobalError : public GlobalErrorWithStandardBubble,
// The error controller to query for error details. Owned by the
// ProfileSyncService this SyncGlobalError depends on.
- SyncErrorController* error_controller_;
+ syncer::SyncErrorController* error_controller_;
const browser_sync::ProfileSyncService* sync_service_;
« no previous file with comments | « chrome/browser/sync/sync_error_notifier_factory_ash.cc ('k') | chrome/browser/sync/sync_global_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698