| Index: chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_client.cc b/chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| index f7a52f062db5457f0d4b452657ea5e0680367550..601aac8efb975af6160b606771fa217427e61f5e 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| @@ -69,6 +69,7 @@ DriveFileSyncClient::DriveFileSyncClient(Profile* profile) {
|
| "" /* custom_user_agent */));
|
| drive_service_->Initialize(profile);
|
| drive_service_->AddObserver(this);
|
| + net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
|
|
|
| drive_uploader_.reset(new google_apis::DriveUploader(drive_service_.get()));
|
| }
|
| @@ -88,12 +89,14 @@ DriveFileSyncClient::DriveFileSyncClient(
|
| drive_service_ = drive_service.Pass();
|
| drive_service_->Initialize(profile);
|
| drive_service_->AddObserver(this);
|
| + net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
|
|
|
| drive_uploader_ = drive_uploader.Pass();
|
| }
|
|
|
| DriveFileSyncClient::~DriveFileSyncClient() {
|
| DCHECK(CalledOnValidThread());
|
| + net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
|
| drive_service_->RemoveObserver(this);
|
| drive_service_->CancelAll();
|
| }
|
| @@ -375,6 +378,14 @@ void DriveFileSyncClient::OnReadyToPerformOperations() {
|
| FOR_EACH_OBSERVER(DriveFileSyncClientObserver, observers_, OnAuthenticated());
|
| }
|
|
|
| +void DriveFileSyncClient::OnConnectionTypeChanged(
|
| + net::NetworkChangeNotifier::ConnectionType type) {
|
| + DCHECK(CalledOnValidThread());
|
| + if (type != net::NetworkChangeNotifier::CONNECTION_NONE)
|
| + FOR_EACH_OBSERVER(DriveFileSyncClientObserver,
|
| + observers_, OnNetworkConnected());
|
| +}
|
| +
|
| void DriveFileSyncClient::DidGetDocumentFeedData(
|
| const DocumentFeedCallback& callback,
|
| google_apis::GDataErrorCode error,
|
|
|