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

Side by Side Diff: chrome/browser/chromeos/drive/sync/entry_revert_performer.cc

Issue 408143014: Rename OperationObserver to OperationDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/chromeos/drive/sync/entry_revert_performer.h" 5 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
6 6
7 #include "chrome/browser/chromeos/drive/change_list_processor.h" 7 #include "chrome/browser/chromeos/drive/change_list_processor.h"
8 #include "chrome/browser/chromeos/drive/drive.pb.h" 8 #include "chrome/browser/chromeos/drive/drive.pb.h"
9 #include "chrome/browser/chromeos/drive/file_change.h" 9 #include "chrome/browser/chromeos/drive/file_change.h"
10 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h" 10 #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h"
11 #include "chrome/browser/chromeos/drive/job_scheduler.h" 11 #include "chrome/browser/chromeos/drive/job_scheduler.h"
12 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" 12 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
13 #include "chrome/browser/chromeos/drive/resource_metadata.h" 13 #include "chrome/browser/chromeos/drive/resource_metadata.h"
14 #include "chrome/browser/drive/drive_api_util.h" 14 #include "chrome/browser/drive/drive_api_util.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "google_apis/drive/drive_api_parser.h" 16 #include "google_apis/drive/drive_api_parser.h"
17 17
18 using content::BrowserThread; 18 using content::BrowserThread;
19 19
20 namespace drive { 20 namespace drive {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 changed_files->Update(new_path, entry, FileChange::ADD_OR_UPDATE); 79 changed_files->Update(new_path, entry, FileChange::ADD_OR_UPDATE);
80 } 80 }
81 return FILE_ERROR_OK; 81 return FILE_ERROR_OK;
82 } 82 }
83 83
84 } // namespace 84 } // namespace
85 85
86 EntryRevertPerformer::EntryRevertPerformer( 86 EntryRevertPerformer::EntryRevertPerformer(
87 base::SequencedTaskRunner* blocking_task_runner, 87 base::SequencedTaskRunner* blocking_task_runner,
88 file_system::OperationObserver* observer, 88 file_system::OperationDelegate* delegate,
89 JobScheduler* scheduler, 89 JobScheduler* scheduler,
90 ResourceMetadata* metadata) 90 ResourceMetadata* metadata)
91 : blocking_task_runner_(blocking_task_runner), 91 : blocking_task_runner_(blocking_task_runner),
92 observer_(observer), 92 delegate_(delegate),
93 scheduler_(scheduler), 93 scheduler_(scheduler),
94 metadata_(metadata), 94 metadata_(metadata),
95 weak_ptr_factory_(this) { 95 weak_ptr_factory_(this) {
96 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 96 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
97 } 97 }
98 98
99 EntryRevertPerformer::~EntryRevertPerformer() { 99 EntryRevertPerformer::~EntryRevertPerformer() {
100 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 100 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
101 } 101 }
102 102
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 base::Owned(changed_files))); 165 base::Owned(changed_files)));
166 } 166 }
167 167
168 void EntryRevertPerformer::RevertEntryAfterFinishRevert( 168 void EntryRevertPerformer::RevertEntryAfterFinishRevert(
169 const FileOperationCallback& callback, 169 const FileOperationCallback& callback,
170 const FileChange* changed_files, 170 const FileChange* changed_files,
171 FileError error) { 171 FileError error) {
172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
173 DCHECK(!callback.is_null()); 173 DCHECK(!callback.is_null());
174 174
175 observer_->OnFileChangedByOperation(*changed_files); 175 delegate_->OnFileChangedByOperation(*changed_files);
176 176
177 callback.Run(error); 177 callback.Run(error);
178 } 178 }
179 179
180 } // namespace internal 180 } // namespace internal
181 } // namespace drive 181 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698