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

Unified Diff: chrome/browser/chromeos/drive/file_system/move_operation.h

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/file_system/move_operation.h
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h
index 2dd7ca926be298508daf6ca7cee552b9b873c6d6..2cf6cf9f7593cd5599a087d0f7eb618f92c43146 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation.h
+++ b/chrome/browser/chromeos/drive/file_system/move_operation.h
@@ -11,9 +11,12 @@
#include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
#include "chrome/browser/google_apis/gdata_errorcode.h"
-class FilePath;
class GURL;
+namespace base {
+class FilePath;
+}
+
namespace drive {
class DriveCache;
@@ -38,14 +41,14 @@ class MoveOperation {
// Performs the move operation on the file at drive path |src_file_path|
// with a target of |dest_file_path|. Invokes |callback| when finished with
// the result of the operation. |callback| must not be null.
- virtual void Move(const FilePath& src_file_path,
- const FilePath& dest_file_path,
+ virtual void Move(const base::FilePath& src_file_path,
+ const base::FilePath& dest_file_path,
const FileOperationCallback& callback);
private:
// Part of Move(). Called after GetEntryInfoPairByPaths() is
// complete. |callback| must not be null.
void MoveAfterGetEntryInfoPair(
- const FilePath& dest_file_path,
+ const base::FilePath& dest_file_path,
const FileOperationCallback& callback,
scoped_ptr<EntryInfoPairResult> result);
@@ -53,7 +56,7 @@ class MoveOperation {
// FileMoveCallback to FileOperationCallback.
void OnFilePathUpdated(const FileOperationCallback& cllback,
DriveFileError error,
- const FilePath& file_path);
+ const base::FilePath& file_path);
// Renames a file or directory at |file_path| to |new_name| in the same
// directory. |callback| will receive the new file path if the operation is
@@ -63,14 +66,14 @@ class MoveOperation {
//
// Can be called from UI thread. |callback| is run on the calling thread.
// |callback| must not be null.
- void Rename(const FilePath& file_path,
- const FilePath::StringType& new_name,
+ void Rename(const base::FilePath& file_path,
+ const base::FilePath::StringType& new_name,
const FileMoveCallback& callback);
// Part of Rename(). Called after GetEntryInfoByPath() is complete.
// |callback| must not be null.
- void RenameAfterGetEntryInfo(const FilePath& file_path,
- const FilePath::StringType& new_name,
+ void RenameAfterGetEntryInfo(const base::FilePath& file_path,
+ const base::FilePath::StringType& new_name,
const FileMoveCallback& callback,
DriveFileError error,
scoped_ptr<DriveEntryProto> entry_proto);
@@ -78,8 +81,8 @@ class MoveOperation {
// Callback for handling resource rename attempt. Renames a file or
// directory at |file_path| on the client side.
// |callback| must not be null.
- void RenameEntryLocally(const FilePath& file_path,
- const FilePath::StringType& new_name,
+ void RenameEntryLocally(const base::FilePath& file_path,
+ const base::FilePath::StringType& new_name,
const FileMoveCallback& callback,
google_apis::GDataErrorCode status);
@@ -90,7 +93,7 @@ class MoveOperation {
// |callback| must not be null.
void RemoveEntryFromDirectory(const FileMoveCallback& callback,
DriveFileError error,
- const FilePath& file_path);
+ const base::FilePath& file_path);
// Part of RemoveEntryFromDirectory(). Called after
// GetEntryInfoPairByPaths() is complete. |callback| must not be null.
@@ -103,10 +106,10 @@ class MoveOperation {
//
// Can be called from UI thread. |callback| is run on the calling thread.
// |callback| must not be null.
- void AddEntryToDirectory(const FilePath& directory_path,
+ void AddEntryToDirectory(const base::FilePath& directory_path,
const FileOperationCallback& callback,
DriveFileError error,
- const FilePath& file_path);
+ const base::FilePath& file_path);
// Part of AddEntryToDirectory(). Called after
// GetEntryInfoPairByPaths() is complete. |callback| must not be null.
@@ -117,8 +120,8 @@ class MoveOperation {
// Moves entry specified by |file_path| to the directory specified by
// |dir_path| and calls |callback| asynchronously.
// |callback| must not be null.
- void MoveEntryToDirectory(const FilePath& file_path,
- const FilePath& directory_path,
+ void MoveEntryToDirectory(const base::FilePath& file_path,
+ const base::FilePath& directory_path,
const FileMoveCallback& callback,
google_apis::GDataErrorCode status);
@@ -128,7 +131,7 @@ class MoveOperation {
void NotifyAndRunFileOperationCallback(
const FileOperationCallback& callback,
DriveFileError error,
- const FilePath& moved_file_path);
+ const base::FilePath& moved_file_path);
// Callback when an entry is moved to another directory on the client side.
// Notifies the directory change and runs |callback|.
@@ -136,7 +139,7 @@ class MoveOperation {
void NotifyAndRunFileMoveCallback(
const FileMoveCallback& callback,
DriveFileError error,
- const FilePath& moved_file_path);
+ const base::FilePath& moved_file_path);
DriveScheduler* drive_scheduler_;
DriveResourceMetadata* metadata_;

Powered by Google App Engine
This is Rietveld 408576698