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

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

Issue 7906013: Show bubble and wrench menu item for sync error (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « no previous file | chrome/browser/sync/profile_sync_service.cc » ('j') | chrome/browser/sync/sync_global_error.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 4a958a15f2d5ede0ab699160277800d240b7d976..a278295a065e89f14d0d90e7339e9bee0497b58f 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -40,6 +40,7 @@ class NotificationSource;
class Profile;
class ProfileSyncFactory;
class SigninManager;
+class SyncGlobalError;
struct ChromeCookieDetails;
namespace browser_sync {
@@ -485,6 +486,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// the user about them any more.
void AcknowledgeSyncedTypes();
+ SyncGlobalError* sync_global_error() { return sync_global_error_.get(); }
+
protected:
// Used by test classes that derive from ProfileSyncService.
virtual browser_sync::SyncBackendHost* GetBackendForTest();
@@ -671,6 +674,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// an action set on it.
browser_sync::SyncProtocolError last_actionable_error_;
+ // This is used to show sync errors in the wrench menu.
+ scoped_ptr<SyncGlobalError> sync_global_error_;
+
DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
};
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service.cc » ('j') | chrome/browser/sync/sync_global_error.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698