Chromium Code Reviews
Help | Chromium Project | Sign in
(15)

Side by Side Diff: chrome/browser/sync_file_system/sync_file_system_service.cc

Issue 11275225: Add a callback to RemoteFileSyncService for reporting errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 1 year, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync_file_system/remote_file_sync_service.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 5 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 const SyncStatusCallback& callback) { 49 const SyncStatusCallback& callback) {
50 DCHECK(local_file_service_); 50 DCHECK(local_file_service_);
51 DCHECK(app_origin == app_origin.GetOrigin()); 51 DCHECK(app_origin == app_origin.GetOrigin());
52 52
53 // TODO(kinuko,tzik): Instantiate the remote_file_service for the given 53 // TODO(kinuko,tzik): Instantiate the remote_file_service for the given
54 // |service_name| if it hasn't been initialized. 54 // |service_name| if it hasn't been initialized.
55 55
56 local_file_service_->MaybeInitializeFileSystemContext( 56 local_file_service_->MaybeInitializeFileSystemContext(
57 app_origin, service_name, file_system_context, callback); 57 app_origin, service_name, file_system_context, callback);
58 58
59 if (remote_file_service_) 59 if (remote_file_service_) {
60 remote_file_service_->RegisterOriginForTrackingChanges(app_origin); 60 remote_file_service_->RegisterOriginForTrackingChanges(
61 app_origin, fileapi::SyncStatusCallback());
kinuko 2012/11/09 07:44:45 Please add TODO to handle this callback too (ok to
tzik 2012/11/09 07:52:40 Done.
62 }
61 } 63 }
62 64
63 void SyncFileSystemService::GetConflictFiles( 65 void SyncFileSystemService::GetConflictFiles(
64 const GURL& app_origin, 66 const GURL& app_origin,
65 const std::string& service_name, 67 const std::string& service_name,
66 const fileapi::SyncFileSetCallback& callback) { 68 const fileapi::SyncFileSetCallback& callback) {
67 DCHECK(app_origin == app_origin.GetOrigin()); 69 DCHECK(app_origin == app_origin.GetOrigin());
68 70
69 // TODO(kinuko): Implement. 71 // TODO(kinuko): Implement.
70 NOTIMPLEMENTED(); 72 NOTIMPLEMENTED();
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 147
146 scoped_ptr<RemoteFileSyncService> remote_file_service; 148 scoped_ptr<RemoteFileSyncService> remote_file_service;
147 // TODO(tzik): Instantiate DriveFileSyncService. 149 // TODO(tzik): Instantiate DriveFileSyncService.
148 150
149 service->Initialize(local_file_service.Pass(), 151 service->Initialize(local_file_service.Pass(),
150 remote_file_service.Pass()); 152 remote_file_service.Pass());
151 return service; 153 return service;
152 } 154 }
153 155
154 } // namespace sync_file_system 156 } // namespace sync_file_system
OLDNEW
« no previous file with comments | « chrome/browser/sync_file_system/remote_file_sync_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1280:2d3e6564b7b6