Index: chrome/browser/sync_file_system/drive_backend/sync_engine.h |
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.h b/chrome/browser/sync_file_system/drive_backend/sync_engine.h |
index b1f36c7b78e6b747adbe2ae64482d5ae3e9ef330..1fe09e7613813014dfa447b86b9d55ad1007665d 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine.h |
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.h |
@@ -18,11 +18,11 @@ |
#include "chrome/browser/sync_file_system/remote_file_sync_service.h" |
#include "chrome/browser/sync_file_system/sync_action.h" |
#include "chrome/browser/sync_file_system/sync_direction.h" |
+#include "components/signin/core/browser/signin_manager_base.h" |
#include "net/base/network_change_notifier.h" |
class ExtensionServiceInterface; |
class ProfileOAuth2TokenService; |
-class SigninManagerBase; |
namespace base { |
class SequencedTaskRunner; |
@@ -60,9 +60,10 @@ class SyncEngine : public RemoteFileSyncService, |
public LocalChangeProcessor, |
public drive::DriveNotificationObserver, |
public drive::DriveServiceObserver, |
- public net::NetworkChangeNotifier::NetworkChangeObserver { |
+ public net::NetworkChangeNotifier::NetworkChangeObserver, |
+ public SigninManagerBase::Observer { |
public: |
- typedef Observer SyncServiceObserver; |
+ typedef RemoteFileSyncService::Observer SyncServiceObserver; |
static scoped_ptr<SyncEngine> CreateForBrowserContext( |
content::BrowserContext* context, |
@@ -131,13 +132,11 @@ class SyncEngine : public RemoteFileSyncService, |
virtual void OnNetworkChanged( |
net::NetworkChangeNotifier::ConnectionType type) OVERRIDE; |
- void OnPendingFileListUpdated(int item_count); |
- void OnFileStatusChanged(const fileapi::FileSystemURL& url, |
- SyncFileStatus file_status, |
- SyncAction sync_action, |
- SyncDirection direction); |
- void UpdateServiceState(RemoteServiceState state, |
- const std::string& description); |
+ // SigninManagerBase::Observer overrides. |
+ virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) OVERRIDE; |
+ virtual void GoogleSigninSucceeded(const std::string& username, |
+ const std::string& password) OVERRIDE; |
+ virtual void GoogleSignedOut(const std::string& username) OVERRIDE; |
private: |
class WorkerObserver; |
@@ -158,6 +157,15 @@ class SyncEngine : public RemoteFileSyncService, |
net::URLRequestContextGetter* request_context, |
leveldb::Env* env_override); |
+ // Called by WorkerObserver. |
+ void OnPendingFileListUpdated(int item_count); |
+ void OnFileStatusChanged(const fileapi::FileSystemURL& url, |
+ SyncFileStatus file_status, |
+ SyncAction sync_action, |
+ SyncDirection direction); |
+ void UpdateServiceState(RemoteServiceState state, |
+ const std::string& description); |
+ |
SyncStatusCallback TrackCallback(const SyncStatusCallback& callback); |
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; |