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

Side by Side Diff: chrome/browser/drive/drive_uploader.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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
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 #ifndef CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_ 5 #ifndef CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_
6 #define CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_ 6 #define CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 virtual ~DriveUploader(); 118 virtual ~DriveUploader();
119 119
120 // DriveUploaderInterface overrides. 120 // DriveUploaderInterface overrides.
121 virtual google_apis::CancelCallback UploadNewFile( 121 virtual google_apis::CancelCallback UploadNewFile(
122 const std::string& parent_resource_id, 122 const std::string& parent_resource_id,
123 const base::FilePath& local_file_path, 123 const base::FilePath& local_file_path,
124 const std::string& title, 124 const std::string& title,
125 const std::string& content_type, 125 const std::string& content_type,
126 const UploadNewFileOptions& options, 126 const UploadNewFileOptions& options,
127 const UploadCompletionCallback& callback, 127 const UploadCompletionCallback& callback,
128 const google_apis::ProgressCallback& progress_callback) OVERRIDE; 128 const google_apis::ProgressCallback& progress_callback) override;
129 virtual google_apis::CancelCallback UploadExistingFile( 129 virtual google_apis::CancelCallback UploadExistingFile(
130 const std::string& resource_id, 130 const std::string& resource_id,
131 const base::FilePath& local_file_path, 131 const base::FilePath& local_file_path,
132 const std::string& content_type, 132 const std::string& content_type,
133 const UploadExistingFileOptions& options, 133 const UploadExistingFileOptions& options,
134 const UploadCompletionCallback& callback, 134 const UploadCompletionCallback& callback,
135 const google_apis::ProgressCallback& progress_callback) OVERRIDE; 135 const google_apis::ProgressCallback& progress_callback) override;
136 virtual google_apis::CancelCallback ResumeUploadFile( 136 virtual google_apis::CancelCallback ResumeUploadFile(
137 const GURL& upload_location, 137 const GURL& upload_location,
138 const base::FilePath& local_file_path, 138 const base::FilePath& local_file_path,
139 const std::string& content_type, 139 const std::string& content_type,
140 const UploadCompletionCallback& callback, 140 const UploadCompletionCallback& callback,
141 const google_apis::ProgressCallback& progress_callback) OVERRIDE; 141 const google_apis::ProgressCallback& progress_callback) override;
142 142
143 private: 143 private:
144 struct UploadFileInfo; 144 struct UploadFileInfo;
145 typedef base::Callback<void(scoped_ptr<UploadFileInfo> upload_file_info)> 145 typedef base::Callback<void(scoped_ptr<UploadFileInfo> upload_file_info)>
146 StartInitiateUploadCallback; 146 StartInitiateUploadCallback;
147 147
148 // Starts uploading a file with |upload_file_info|. 148 // Starts uploading a file with |upload_file_info|.
149 google_apis::CancelCallback StartUploadFile( 149 google_apis::CancelCallback StartUploadFile(
150 scoped_ptr<UploadFileInfo> upload_file_info, 150 scoped_ptr<UploadFileInfo> upload_file_info,
151 const StartInitiateUploadCallback& start_initiate_upload_callback); 151 const StartInitiateUploadCallback& start_initiate_upload_callback);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 // Note: This should remain the last member so it'll be destroyed and 205 // Note: This should remain the last member so it'll be destroyed and
206 // invalidate its weak pointers before any other members are destroyed. 206 // invalidate its weak pointers before any other members are destroyed.
207 base::WeakPtrFactory<DriveUploader> weak_ptr_factory_; 207 base::WeakPtrFactory<DriveUploader> weak_ptr_factory_;
208 DISALLOW_COPY_AND_ASSIGN(DriveUploader); 208 DISALLOW_COPY_AND_ASSIGN(DriveUploader);
209 }; 209 };
210 210
211 } // namespace drive 211 } // namespace drive
212 212
213 #endif // CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_ 213 #endif // CHROME_BROWSER_DRIVE_DRIVE_UPLOADER_H_
OLDNEW
« no previous file with comments | « chrome/browser/drive/drive_notification_manager_factory.h ('k') | chrome/browser/drive/drive_uploader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698