diff options
Diffstat (limited to 'chrome/browser')
145 files changed, 709 insertions, 499 deletions
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 657dc3a..a288308 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -44,7 +44,6 @@ class AutomationTabTracker; class AutomationWindowTracker; class Browser; class ExternalTabContainer; -class FilePath; class FindInPageNotificationObserver; class InitialLoadObserver; class LoginHandler; diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h index ed15a16..c0dd000 100644 --- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h +++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h @@ -11,7 +11,9 @@ @class NSString; #endif // __OBJC__ +namespace base { class FilePath; +} // This set of functions lets C++ code interact with the cocoa pasteboard // and dragging methods. @@ -25,12 +27,12 @@ enum PasteboardType { // Writes a set of bookmark elements from a profile to the specified pasteboard. void WriteToPasteboard(PasteboardType type, const std::vector<BookmarkNodeData::Element>& elements, - const FilePath& profile_path); + const base::FilePath& profile_path); // Reads a set of bookmark elements from the specified pasteboard. bool ReadFromPasteboard(PasteboardType type, std::vector<BookmarkNodeData::Element>& elements, - FilePath* profile_path); + base::FilePath* profile_path); // Returns true if the specified pasteboard contains any sort of // bookmark elements. It currently does not consider a plaintext url a diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h index 93cb59a..e7a06e4 100644 --- a/chrome/browser/chromeos/customization_document.h +++ b/chrome/browser/chromeos/customization_document.h @@ -16,11 +16,11 @@ #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" -class FilePath; class PrefServiceSimple; namespace base { class DictionaryValue; +class FilePath; } namespace net { @@ -44,7 +44,7 @@ class CustomizationDocument { protected: explicit CustomizationDocument(const std::string& accepted_version); - virtual bool LoadManifestFromFile(const FilePath& manifest_path); + virtual bool LoadManifestFromFile(const base::FilePath& manifest_path); virtual bool LoadManifestFromString(const std::string& manifest); std::string GetLocaleSpecificString(const std::string& locale, @@ -158,7 +158,7 @@ class ServicesCustomizationDocument : public CustomizationDocument, void StartFileFetch(); // Executes on FILE thread and reads file to string. - void ReadFileInBackground(const FilePath& file); + void ReadFileInBackground(const base::FilePath& file); // Services customization manifest URL. GURL url_; diff --git a/chrome/browser/chromeos/drive/drive_feed_loader_observer.h b/chrome/browser/chromeos/drive/drive_feed_loader_observer.h index 7232a78..1d3e504 100644 --- a/chrome/browser/chromeos/drive/drive_feed_loader_observer.h +++ b/chrome/browser/chromeos/drive/drive_feed_loader_observer.h @@ -7,7 +7,9 @@ #include <string> +namespace base { class FilePath; +} namespace drive { @@ -18,7 +20,7 @@ class DriveFeedLoaderObserver { // Triggered when a content of a directory has been changed. // |directory_path| is a virtual directory path representing the // changed directory. - virtual void OnDirectoryChanged(const FilePath& directory_path) { + virtual void OnDirectoryChanged(const base::FilePath& directory_path) { } // Triggered when a resource list is fetched. |num_accumulated_entries| diff --git a/chrome/browser/chromeos/drive/drive_file_system_observer.h b/chrome/browser/chromeos/drive/drive_file_system_observer.h index 4bc1520..0d3a678 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_observer.h +++ b/chrome/browser/chromeos/drive/drive_file_system_observer.h @@ -7,7 +7,9 @@ #include "chrome/browser/chromeos/drive/drive_file_error.h" +namespace base { class FilePath; +} namespace drive { @@ -19,7 +21,7 @@ class DriveFileSystemObserver { // Triggered when a content of a directory has been changed. // |directory_path| is a virtual directory path (/drive/...) representing // changed directory. - virtual void OnDirectoryChanged(const FilePath& directory_path) { + virtual void OnDirectoryChanged(const base::FilePath& directory_path) { } // Triggered when the file system is initially loaded. diff --git a/chrome/browser/chromeos/drive/drive_file_system_util.h b/chrome/browser/chromeos/drive/drive_file_system_util.h index c68be24..0f9a6a6 100644 --- a/chrome/browser/chromeos/drive/drive_file_system_util.h +++ b/chrome/browser/chromeos/drive/drive_file_system_util.h @@ -16,9 +16,12 @@ #include "chrome/browser/google_apis/gdata_errorcode.h" #include "googleurl/src/gurl.h" -class FilePath; class Profile; +namespace base { +class FilePath; +} + namespace drive { class PlatformFileInfoProto; @@ -39,13 +42,13 @@ const char kWildCard[] = "*"; const char kSymLinkToDevNull[] = "/dev/null"; // Returns the Drive mount point path, which looks like "/special/drive". -const FilePath& GetDriveMountPointPath(); +const base::FilePath& GetDriveMountPointPath(); // Returns the Drive mount path as string. const std::string& GetDriveMountPointPathAsString(); // Returns the 'local' root of remote file system as "/special". -const FilePath& GetSpecialRemoteRootPath(); +const base::FilePath& GetSpecialRemoteRootPath(); // Returns the gdata file resource url formatted as // chrome://drive/<resource_id>/<file_name>. @@ -54,16 +57,16 @@ GURL GetFileResourceUrl(const std::string& resource_id, // Given a profile and a drive_cache_path, return the file resource url. void ModifyDriveFileResourceUrl(Profile* profile, - const FilePath& drive_cache_path, + const base::FilePath& drive_cache_path, GURL* url); // Returns true if the given path is under the Drive mount point. -bool IsUnderDriveMountPoint(const FilePath& path); +bool IsUnderDriveMountPoint(const base::FilePath& path); // Extracts the Drive path from the given path located under the Drive mount // point. Returns an empty path if |path| is not under the Drive mount point. // Examples: ExtractGDatPath("/special/drive/foo.txt") => "drive/foo.txt" -FilePath ExtractDrivePath(const FilePath& path); +base::FilePath ExtractDrivePath(const base::FilePath& path); // Escapes a file name in Drive cache. // Replaces percent ('%'), period ('.') and slash ('/') with %XX (hex) @@ -90,13 +93,13 @@ std::string ExtractResourceIdFromUrl(const GURL& url); // Case 3: Mounted files have all three parts. // Example: path="/user/GCache/v1/persistent/pdf:a1b2.01234567.mounted" => // resource_id="pdf:a1b2", md5="01234567", extra_extension="mounted". -void ParseCacheFilePath(const FilePath& path, +void ParseCacheFilePath(const base::FilePath& path, std::string* resource_id, std::string* md5, std::string* extra_extension); -// Callback type for PrepareWritableFilePathAndRun. -typedef base::Callback<void (DriveFileError, const FilePath& path)> +// Callback type for PrepareWritablebase::FilePathAndRun. +typedef base::Callback<void (DriveFileError, const base::FilePath& path)> OpenFileCallback; // Invokes |callback| on blocking thread pool, after converting virtual |path| @@ -108,7 +111,7 @@ typedef base::Callback<void (DriveFileError, const FilePath& path)> // // Must be called from UI thread. void PrepareWritableFileAndRun(Profile* profile, - const FilePath& path, + const base::FilePath& path, const OpenFileCallback& callback); // Ensures the existence of |directory| of '/special/drive/foo'. This will @@ -122,7 +125,7 @@ void PrepareWritableFileAndRun(Profile* profile, // // Must be called from UI/IO thread. void EnsureDirectoryExists(Profile* profile, - const FilePath& directory, + const base::FilePath& directory, const FileOperationCallback& callback); // Converts GData error code into file platform error code. diff --git a/chrome/browser/chromeos/drive/drive_prefetcher.h b/chrome/browser/chromeos/drive/drive_prefetcher.h index 39e08f9..4bb599c 100644 --- a/chrome/browser/chromeos/drive/drive_prefetcher.h +++ b/chrome/browser/chromeos/drive/drive_prefetcher.h @@ -17,7 +17,9 @@ #include "chrome/browser/chromeos/drive/drive_file_system_observer.h" #include "chrome/browser/chromeos/drive/drive_sync_client_observer.h" +namespace base { class FilePath; +} namespace drive { @@ -45,7 +47,8 @@ class DrivePrefetcher : public DriveFileSystemObserver, // DriveFileSystemObserver overrides. virtual void OnInitialLoadFinished(DriveFileError error) OVERRIDE; - virtual void OnDirectoryChanged(const FilePath& directory_path) OVERRIDE; + virtual void OnDirectoryChanged( + const base::FilePath& directory_path) OVERRIDE; // DriveSyncClientObserver overrides. virtual void OnSyncTaskStarted() OVERRIDE; @@ -63,7 +66,7 @@ class DrivePrefetcher : public DriveFileSystemObserver, // Called when DoPrefetch is done. void OnPrefetchFinished(const std::string& resource_id, DriveFileError error, - const FilePath& file_path, + const base::FilePath& file_path, const std::string& mime_type, DriveFileType file_type); @@ -72,8 +75,8 @@ class DrivePrefetcher : public DriveFileSystemObserver, // Helper methods to traverse over the file system. void VisitFile(const DriveEntryProto& entry); - void VisitDirectory(const FilePath& directory_path); - void OnReadDirectory(const FilePath& directory_path, + void VisitDirectory(const base::FilePath& directory_path); + void OnReadDirectory(const base::FilePath& directory_path, DriveFileError error, bool hide_hosted_documents, scoped_ptr<DriveEntryProtoVector> entries); diff --git a/chrome/browser/chromeos/drive/drive_system_service.h b/chrome/browser/chromeos/drive/drive_system_service.h index d36cc28..bbd0c8a 100644 --- a/chrome/browser/chromeos/drive/drive_system_service.h +++ b/chrome/browser/chromeos/drive/drive_system_service.h @@ -17,7 +17,9 @@ #include "chrome/browser/profiles/profile_keyed_service_factory.h" #include "sync/notifier/invalidation_handler.h" +namespace base { class FilePath; +} namespace google_apis { class DriveServiceInterface; @@ -50,7 +52,7 @@ class DriveSystemService : public ProfileKeyedService, // Pass NULL or the empty value when not interested. DriveSystemService(Profile* profile, google_apis::DriveServiceInterface* test_drive_service, - const FilePath& test_cache_root, + const base::FilePath& test_cache_root, DriveFileSystemInterface* test_file_system); virtual ~DriveSystemService(); diff --git a/chrome/browser/chromeos/drive/drive_test_util.h b/chrome/browser/chromeos/drive/drive_test_util.h index 7fc616b..fedd045 100644 --- a/chrome/browser/chromeos/drive/drive_test_util.h +++ b/chrome/browser/chromeos/drive/drive_test_util.h @@ -10,9 +10,8 @@ #include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/google_apis/test_util.h" -class FilePath; - namespace base { +class FilePath; class Value; } @@ -51,9 +50,9 @@ void CopyErrorCodeFromFileOperationCallback(DriveFileError* output, // Copies |error| and |moved_file_path| to |out_error| and |out_file_path|. // Used to run asynchronous functions that take FileMoveCallback from tests. void CopyResultsFromFileMoveCallback(DriveFileError* out_error, - FilePath* out_file_path, + base::FilePath* out_file_path, DriveFileError error, - const FilePath& moved_file_path); + const base::FilePath& moved_file_path); // Copies |error| and |entry_proto| to |out_error| and |out_entry_proto| // respectively. Used to run asynchronous functions that take @@ -85,14 +84,14 @@ void CopyResultsFromReadDirectoryByPathCallback( // Copies |error|, |drive_file_path|, and |entry_proto| to |out_error|, // |out_drive_file_path|, and |out_entry_proto| respectively. Used to run -// asynchronous functions that take GetEntryInfoWithFilePathCallback from +// asynchronous functions that take GetEntryInfoWithbase::FilePathCallback from // tests. void CopyResultsFromGetEntryInfoWithFilePathCallback( DriveFileError* out_error, - FilePath* out_drive_file_path, + base::FilePath* out_drive_file_path, scoped_ptr<DriveEntryProto>* out_entry_proto, DriveFileError error, - const FilePath& drive_file_path, + const base::FilePath& drive_file_path, scoped_ptr<DriveEntryProto> entry_proto); // Copies |result| to |out_result|. Used to run asynchronous functions @@ -108,10 +107,11 @@ void CopyResultFromInitializeCacheCallback(bool* out_success, // Copies results from DriveCache methods. Used to run asynchronous functions // that take GetFileFromCacheCallback from tests. -void CopyResultsFromGetFileFromCacheCallback(DriveFileError* out_error, - FilePath* out_cache_file_path, - DriveFileError error, - const FilePath& cache_file_path); +void CopyResultsFromGetFileFromCacheCallback( + DriveFileError* out_error, + base::FilePath* out_cache_file_path, + DriveFileError error, + const base::FilePath& cache_file_path); // Copies results from DriveCache methods. Used to run asynchronous functions // that take GetCacheEntryCallback from tests. @@ -123,10 +123,10 @@ void CopyResultsFromGetCacheEntryCallback(bool* out_success, // Copies results from DriveFileSystem methods. Used to run asynchronous // functions that take GetFileCallback from tests. void CopyResultsFromGetFileCallback(DriveFileError* out_error, - FilePath* out_file_path, + base::FilePath* out_file_path, DriveFileType* out_file_type, DriveFileError error, - const FilePath& file_path, + const base::FilePath& file_path, const std::string& mime_type, DriveFileType file_type); @@ -143,9 +143,9 @@ void CopyResultsFromGetAvailableSpaceCallback(DriveFileError* out_error, // of the current thread. Used to run asynchronous function that take // OpenFileCallback. void CopyResultsFromOpenFileCallbackAndQuit(DriveFileError* out_error, - FilePath* out_file_path, + base::FilePath* out_file_path, DriveFileError error, - const FilePath& file_path); + const base::FilePath& file_path); // Copies the results from DriveFileSystem methods and stops the message loop // of the current thread. Used to run asynchronous function that take diff --git a/chrome/browser/chromeos/drive/drive_webapps_registry.h b/chrome/browser/chromeos/drive/drive_webapps_registry.h index 6827079..e907db5 100644 --- a/chrome/browser/chromeos/drive/drive_webapps_registry.h +++ b/chrome/browser/chromeos/drive/drive_webapps_registry.h @@ -13,7 +13,9 @@ #include "chrome/browser/google_apis/gdata_wapi_parser.h" #include "googleurl/src/gurl.h" +namespace base { class FilePath; +} namespace google_apis { class AppList; @@ -57,7 +59,7 @@ class DriveWebAppsRegistry { virtual ~DriveWebAppsRegistry(); // DriveWebAppsRegistry overrides. - virtual void GetWebAppsForFile(const FilePath& file, + virtual void GetWebAppsForFile(const base::FilePath& file, const std::string& mime_type, ScopedVector<DriveWebAppInfo>* apps); virtual std::set<std::string> GetExtensionsForWebStoreApp( diff --git a/chrome/browser/chromeos/drive/file_system/copy_operation.h b/chrome/browser/chromeos/drive/file_system/copy_operation.h index 6ca1c5d..1f1ab25 100644 --- a/chrome/browser/chromeos/drive/file_system/copy_operation.h +++ b/chrome/browser/chromeos/drive/file_system/copy_operation.h @@ -11,10 +11,10 @@ #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; class Value; } @@ -49,8 +49,8 @@ class CopyOperation { // Performs the copy 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 Copy(const FilePath& src_file_path, - const FilePath& dest_file_path, + virtual void Copy(const base::FilePath& src_file_path, + const base::FilePath& dest_file_path, const FileOperationCallback& callback); // Initiates transfer of |remote_src_file_path| to |local_dest_file_path|. @@ -60,8 +60,8 @@ class CopyOperation { // Must be called from *UI* thread. |callback| is run on the calling thread. // |callback| must not be null. virtual void TransferFileFromRemoteToLocal( - const FilePath& remote_src_file_path, - const FilePath& local_dest_file_path, + const base::FilePath& remote_src_file_path, + const base::FilePath& local_dest_file_path, const FileOperationCallback& callback); // Initiates transfer of |local_src_file_path| to |remote_dest_file_path|. @@ -72,8 +72,8 @@ class CopyOperation { // Must be called from *UI* thread. |callback| is run on the calling thread. // |callback| must not be null. virtual void TransferFileFromLocalToRemote( - const FilePath& local_src_file_path, - const FilePath& remote_dest_file_path, + const base::FilePath& local_src_file_path, + const base::FilePath& remote_dest_file_path, const FileOperationCallback& callback); // Initiates transfer of |local_file_path| to |remote_dest_file_path|. @@ -83,8 +83,8 @@ class CopyOperation { // // Must be called from *UI* thread. |callback| is run on the calling thread. // |callback| must not be null. - virtual void TransferRegularFile(const FilePath& local_file_path, - const FilePath& remote_dest_file_path, + virtual void TransferRegularFile(const base::FilePath& local_file_path, + const base::FilePath& remote_dest_file_path, const FileOperationCallback& callback); private: @@ -98,27 +98,28 @@ class CopyOperation { // // Can be called from UI thread. |callback| is run on the calling thread. // |callback| must not be null. - void OnGetFileCompleteForTransferFile(const FilePath& local_dest_file_path, - const FileOperationCallback& callback, - DriveFileError error, - const FilePath& local_file_path, - const std::string& unused_mime_type, - DriveFileType file_type); + void OnGetFileCompleteForTransferFile( + const base::FilePath& local_dest_file_path, + const FileOperationCallback& callback, + DriveFileError error, + const base::FilePath& local_file_path, + const std::string& unused_mime_type, + DriveFileType file_type); // Copies a hosted document with |resource_id| to the directory at |dir_path| // and names the copied document as |new_name|. // // Can be called from UI thread. |callback| is run on the calling thread. // |callback| must not be null. - void CopyHostedDocumentToDirectory(const FilePath& dir_path, + void CopyHostedDocumentToDirectory(const base::FilePath& dir_path, const std::string& resource_id, - const FilePath::StringType& new_name, + const base::FilePath::StringType& new_name, const FileOperationCallback& callback); // Callback for handling document copy attempt. // |callback| must not be null. void OnCopyHostedDocumentCompleted( - const FilePath& dir_path, + const base::FilePath& dir_path, const FileOperationCallback& callback, google_apis::GDataErrorCode status, scoped_ptr<google_apis::ResourceEntry> resource_entry); @@ -129,14 +130,14 @@ class CopyOperation { // // Can be called from UI thread. |callback| is run on the calling thread. // |callback| must not be null. - void MoveEntryFromRootDirectory(const FilePath& directory_path, + void MoveEntryFromRootDirectory(const base::FilePath& directory_path, const FileOperationCallback& callback, DriveFileError error, - const FilePath& file_path); + const base::FilePath& file_path); // Part of Copy(). Called after GetEntryInfoPairByPaths() is // complete. |callback| must not be null. - void CopyAfterGetEntryInfoPair(const FilePath& dest_file_path, + void CopyAfterGetEntryInfoPair(const base::FilePath& dest_file_path, const FileOperationCallback& callback, scoped_ptr<EntryInfoPairResult> result); @@ -145,10 +146,10 @@ class CopyOperation { // |local_file_path| to |remote_dest_file_path|. // // Can be called from UI thread. |callback| is run on the calling thread. - void OnGetFileCompleteForCopy(const FilePath& remote_dest_file_path, + void OnGetFileCompleteForCopy(const base::FilePath& remote_dest_file_path, const FileOperationCallback& callback, DriveFileError error, - const FilePath& local_file_path, + const base::FilePath& local_file_path, const std::string& unused_mime_type, DriveFileType file_type); @@ -170,15 +171,15 @@ class CopyOperation { void OnTransferCompleted( const FileOperationCallback& callback, google_apis::DriveUploadError error, - const FilePath& drive_path, - const FilePath& file_path, + const base::FilePath& drive_path, + const base::FilePath& file_path, scoped_ptr<google_apis::ResourceEntry> resource_entry); // Part of TransferFileFromLocalToRemote(). Called after // GetEntryInfoByPath() is complete. void TransferFileFromLocalToRemoteAfterGetEntryInfo( - const FilePath& local_src_file_path, - const FilePath& remote_dest_file_path, + const base::FilePath& local_src_file_path, + const base::FilePath& remote_dest_file_path, const FileOperationCallback& callback, DriveFileError error, scoped_ptr<DriveEntryProto> entry_proto); @@ -192,8 +193,8 @@ class CopyOperation { // // Must be called from *UI* thread. |callback| is run on the calling thread. // |callback| must not be null. - void TransferFileForResourceId(const FilePath& local_file_path, - const FilePath& remote_dest_file_path, + void TransferFileForResourceId(const base::FilePath& local_file_path, + const base::FilePath& remote_dest_file_path, const FileOperationCallback& callback, const std::string& resource_id); diff --git a/chrome/browser/chromeos/drive/file_system/drive_operations.h b/chrome/browser/chromeos/drive/file_system/drive_operations.h index b9cd3e9..1f188ac 100644 --- a/chrome/browser/chromeos/drive/file_system/drive_operations.h +++ b/chrome/browser/chromeos/drive/file_system/drive_operations.h @@ -9,7 +9,9 @@ #include "base/sequenced_task_runner.h" #include "chrome/browser/chromeos/drive/drive_resource_metadata.h" +namespace base { class FilePath; +} namespace google_apis { class DriveUploaderInterface; @@ -52,37 +54,38 @@ class DriveOperations { // Wrapper function for copy_operation_. // |callback| must not be null. - void Copy(const FilePath& src_file_path, - const FilePath& dest_file_path, + void Copy(const base::FilePath& src_file_path, + const base::FilePath& dest_file_path, const FileOperationCallback& callback); // Wrapper function for copy_operation_. // |callback| must not be null. - void TransferFileFromRemoteToLocal(const FilePath& remote_src_file_path, - const FilePath& local_dest_file_path, + void TransferFileFromRemoteToLocal(const base::FilePath& remote_src_file_path, + const base::FilePath& local_dest_file_path, const FileOperationCallback& callback); // Wrapper function for copy_operation_. // |callback| must not be null. - void TransferFileFromLocalToRemote(const FilePath& local_src_file_path, - const FilePath& remote_dest_file_path, - const FileOperationCallback& callback); + void TransferFileFromLocalToRemote( + const base::FilePath& local_src_file_path, + const base::FilePath& remote_dest_file_path, + const FileOperationCallback& callback); // Wrapper function for copy_operation_. // |callback| must not be null. - void TransferRegularFile(const FilePath& local_src_file_path, - const FilePath& remote_dest_file_path, + void TransferRegularFile(const base::FilePath& local_src_file_path, + const base::FilePath& remote_dest_file_path, const FileOperationCallback& callback); // Wrapper function for move_operation_. // |callback| must not be null. - void Move(const FilePath& src_file_path, - const FilePath& dest_file_path, + void Move(const base::FilePath& src_file_path, + const base::FilePath& dest_file_path, const FileOperationCallback& callback); // Wrapper function for remove_operation_. // |callback| must not be null. - void Remove(const FilePath& file_path, + void Remove(const base::FilePath& file_path, bool is_recursive, const FileOperationCallback& callback); diff --git a/chrome/browser/chromeos/drive/file_system/move_operation.h b/chrome/browser/chromeos/drive/file_system/move_operation.h index 2dd7ca9..2cf6cf9 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_; diff --git a/chrome/browser/chromeos/drive/file_system/operation_observer.h b/chrome/browser/chromeos/drive/file_system/operation_observer.h index 3c73f53..bfa4333 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_observer.h +++ b/chrome/browser/chromeos/drive/file_system/operation_observer.h @@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_OBSERVER_H_ #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_OBSERVER_H_ +namespace base { class FilePath; +} namespace drive { namespace file_system { @@ -17,7 +19,7 @@ class OperationObserver { // |directory_path| is a virtual directory path representing the // changed directory. virtual void OnDirectoryChangedByOperation( - const FilePath& directory_path) = 0; + const base::FilePath& directory_path) = 0; }; } // namespace file_system diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation.h b/chrome/browser/chromeos/drive/file_system/remove_operation.h index f856eeb..df0c0d7 100644 --- a/chrome/browser/chromeos/drive/file_system/remove_operation.h +++ b/chrome/browser/chromeos/drive/file_system/remove_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 google_apis { } @@ -42,7 +45,7 @@ class RemoveOperation { // Perform the remove operation on the file at drive path |file_path|. // Invokes |callback| when finished with the result of the operation. // |callback| must not be null. - virtual void Remove(const FilePath& file_path, + virtual void Remove(const base::FilePath& file_path, bool is_recursive, const FileOperationCallback& callback); @@ -67,7 +70,7 @@ class RemoveOperation { void NotifyDirectoryChanged( const FileOperationCallback& callback, DriveFileError error, - const FilePath& directory_path); + const base::FilePath& directory_path); DriveScheduler* drive_scheduler_; DriveCache* cache_; diff --git a/chrome/browser/chromeos/drive/file_system/update_operation.h b/chrome/browser/chromeos/drive/file_system/update_operation.h index da0f39e..e4eb37b 100644 --- a/chrome/browser/chromeos/drive/file_system/update_operation.h +++ b/chrome/browser/chromeos/drive/file_system/update_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 google_apis { class DriveUploaderInterface; } @@ -58,7 +61,7 @@ class UpdateOperation { void UpdateFileByEntryInfo( const FileOperationCallback& callback, DriveFileError error, - const FilePath& drive_file_path, + const base::FilePath& drive_file_path, scoped_ptr<DriveEntryProto> entry_proto); // Part of UpdateFileByResourceId(). @@ -66,10 +69,10 @@ class UpdateOperation { // UpdateFileByResourceId(). // |callback| must not be null. void OnGetFileCompleteForUpdateFile(const FileOperationCallback& callback, - const FilePath& drive_file_path, + const base::FilePath& drive_file_path, scoped_ptr<DriveEntryProto> entry_proto, DriveFileError error, - const FilePath& cache_file_path); + const base::FilePath& cache_file_path); // Part of UpdateFileByResourceId(). // Called when DriveUploader::UploadUpdatedFile() is completed for @@ -78,15 +81,15 @@ class UpdateOperation { void OnUpdatedFileUploaded( const FileOperationCallback& callback, google_apis::DriveUploadError error, - const FilePath& gdata_path, - const FilePath& file_path, + const base::FilePath& gdata_path, + const base::FilePath& file_path, scoped_ptr<google_apis::ResourceEntry> resource_entry); // Part of UpdateFileByResourceId(). // |callback| must not be null. void OnUpdatedFileRefreshed(const FileOperationCallback& callback, DriveFileError error, - const FilePath& drive_file_path, + const base::FilePath& drive_file_path, scoped_ptr<DriveEntryProto> entry_proto); DriveCache* cache_; diff --git a/chrome/browser/chromeos/drive/file_write_helper.h b/chrome/browser/chromeos/drive/file_write_helper.h index e1bf8f7..da30212 100644 --- a/chrome/browser/chromeos/drive/file_write_helper.h +++ b/chrome/browser/chromeos/drive/file_write_helper.h @@ -9,7 +9,9 @@ #include "chrome/browser/chromeos/drive/drive_file_error.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" +namespace base { class FilePath; +} namespace drive { @@ -26,7 +28,7 @@ class FileWriteHelper { // file is created. // // Must be called from UI thread. - void PrepareWritableFileAndRun(const FilePath& path, + void PrepareWritableFileAndRun(const base::FilePath& path, const OpenFileCallback& callback); private: @@ -34,15 +36,15 @@ class FileWriteHelper { // file does not exist yet, does OpenFile to download and mark the file as // dirty, runs |callback|, and finally calls CloseFile. void PrepareWritableFileAndRunAfterCreateFile( - const FilePath& file_path, + const base::FilePath& file_path, const OpenFileCallback& callback, DriveFileError result); void PrepareWritableFileAndRunAfterOpenFile( - const FilePath& file_path, + const base::FilePath& file_path, const OpenFileCallback& callback, DriveFileError result, - const FilePath& local_cache_path); - void PrepareWritableFileAndRunAfterCallback(const FilePath& file_path); + const base::FilePath& local_cache_path); + void PrepareWritableFileAndRunAfterCallback(const base::FilePath& file_path); // File system owned by DriveSystemService. DriveFileSystemInterface* file_system_; diff --git a/chrome/browser/chromeos/enterprise_extension_observer.h b/chrome/browser/chromeos/enterprise_extension_observer.h index 8ffd97c..1f51da3 100644 --- a/chrome/browser/chromeos/enterprise_extension_observer.h +++ b/chrome/browser/chromeos/enterprise_extension_observer.h @@ -13,9 +13,12 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" -class FilePath; class Profile; +namespace base { +class FilePath; +} + namespace chromeos { // This observer listens for installed extensions and restarts the ChromeOS @@ -31,7 +34,7 @@ class EnterpriseExtensionObserver const content::NotificationDetails& details) OVERRIDE; private: - static void CheckExtensionAndNotifyEntd(const FilePath& path); + static void CheckExtensionAndNotifyEntd(const base::FilePath& path); static void NotifyEntd(); Profile* profile_; diff --git a/chrome/browser/chromeos/imageburner/burn_controller.h b/chrome/browser/chromeos/imageburner/burn_controller.h index e35ecd6..a0e62c9 100644 --- a/chrome/browser/chromeos/imageburner/burn_controller.h +++ b/chrome/browser/chromeos/imageburner/burn_controller.h @@ -10,9 +10,8 @@ #include "base/basictypes.h" #include "chromeos/disks/disk_mount_manager.h" -class FilePath; - namespace base { +class FilePath; class TimeDelta; } @@ -69,8 +68,8 @@ class BurnController { // Returns devices on which we can burn recovery image. virtual std::vector<disks::DiskMountManager::Disk> GetBurnableDevices() = 0; // Starts burning process. - virtual void StartBurnImage(const FilePath& target_device_path, - const FilePath& target_file_path) = 0; + virtual void StartBurnImage(const base::FilePath& target_device_path, + const base::FilePath& target_file_path) = 0; // Cancels burning process. virtual void CancelBurnImage() = 0; // Creates a new instance of BurnController. diff --git a/chrome/browser/chromeos/login/user_image_manager.h b/chrome/browser/chromeos/login/user_image_manager.h index f6e4ea4..00bb9a7 100644 --- a/chrome/browser/chromeos/login/user_image_manager.h +++ b/chrome/browser/chromeos/login/user_image_manager.h @@ -9,9 +9,12 @@ #include "chrome/browser/chromeos/login/user.h" -class FilePath; class PrefServiceSimple; +namespace base { +class FilePath; +} + namespace gfx { class ImageSkia; } @@ -49,7 +52,7 @@ class UserImageManager { // Tries to load user image from disk; if successful, sets it for the user, // sends LOGIN_USER_IMAGE_CHANGED notification and updates Local State. virtual void SaveUserImageFromFile(const std::string& username, - const FilePath& path) = 0; + const base::FilePath& path) = 0; // Sets profile image as user image for |username|, sends // LOGIN_USER_IMAGE_CHANGED notification and updates Local State. If the user diff --git a/chrome/browser/chromeos/login/user_image_manager_impl.h b/chrome/browser/chromeos/login/user_image_manager_impl.h index 448be58..e6fb534 100644 --- a/chrome/browser/chromeos/login/user_image_manager_impl.h +++ b/chrome/browser/chromeos/login/user_image_manager_impl.h @@ -21,6 +21,10 @@ class ProfileDownloader; class UserImage; +namespace base { +class FilePath; +} + namespace chromeos { class UserImageManagerImpl : public UserImageManager, @@ -39,7 +43,7 @@ class UserImageManagerImpl : public UserImageManager, virtual void SaveUserImage(const std::string& username, const UserImage& user_image) OVERRIDE; virtual void SaveUserImageFromFile(const std::string& username, - const FilePath& path) OVERRIDE; + const base::FilePath& path) OVERRIDE; virtual void SaveUserImageFromProfileImage( const std::string& username) OVERRIDE; virtual void DeleteUserImage(const std::string& username) OVERRIDE; @@ -63,7 +67,7 @@ class UserImageManagerImpl : public UserImageManager, ProfileDownloaderDelegate::FailureReason reason) OVERRIDE; // Returns image filepath for the given user. - FilePath GetImagePathForUser(const std::string& username); + base::FilePath GetImagePathForUser(const std::string& username); // Sets one of the default images for the specified user and saves this // setting in local state. @@ -90,7 +94,7 @@ class UserImageManagerImpl : public UserImageManager, // Local State on UI thread. void SaveImageToFile(const std::string& username, const UserImage& user_image, - const FilePath& image_path, + const base::FilePath& image_path, int image_index, const GURL& image_url); @@ -105,7 +109,7 @@ class UserImageManagerImpl : public UserImageManager, // Saves |image| to the specified |image_path|. Runs on FILE thread. bool SaveBitmapToFile(const UserImage& user_image, - const FilePath& image_path); + const base::FilePath& image_path); // Initializes |downloaded_profile_image_| with the picture of the logged-in // user. diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h index c9bdf7c..7d3c0f6 100644 --- a/chrome/browser/chromeos/login/user_manager_impl.h +++ b/chrome/browser/chromeos/login/user_manager_impl.h @@ -24,7 +24,6 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -class FilePath; class PrefService; class ProfileSyncService; diff --git a/chrome/browser/chromeos/mobile_config.h b/chrome/browser/chromeos/mobile_config.h index d422ed4..1c98ff5 100644 --- a/chrome/browser/chromeos/mobile_config.h +++ b/chrome/browser/chromeos/mobile_config.h @@ -15,10 +15,9 @@ #include "base/time.h" #include "chrome/browser/chromeos/customization_document.h" -class FilePath; - namespace base { class DictionaryValue; +class FilePath; } namespace chromeos { @@ -180,8 +179,8 @@ class MobileConfig : public CustomizationDocument { const std::string& local_config); // Executes on FILE thread and reads config files to string. - void ReadConfigInBackground(const FilePath& global_config_file, - const FilePath& local_config_file); + void ReadConfigInBackground(const base::FilePath& global_config_file, + const base::FilePath& local_config_file); // Maps external carrier ID to internal carrier ID. CarrierIdMap carrier_id_map_; diff --git a/chrome/browser/chromeos/settings/owner_key_util.h b/chrome/browser/chromeos/settings/owner_key_util.h index fc94394..2568cfa 100644 --- a/chrome/browser/chromeos/settings/owner_key_util.h +++ b/chrome/browser/chromeos/settings/owner_key_util.h @@ -14,7 +14,9 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" +namespace base { class FilePath; +} namespace crypto { class RSAPrivateKey; @@ -59,7 +61,7 @@ class OwnerKeyUtilImpl : public OwnerKeyUtil { // key will live. static const char kOwnerKeyFile[]; - explicit OwnerKeyUtilImpl(const FilePath& public_key_file); + explicit OwnerKeyUtilImpl(const base::FilePath& public_key_file); // OwnerKeyUtil: virtual bool ImportPublicKey(std::vector<uint8>* output) OVERRIDE; @@ -72,7 +74,7 @@ class OwnerKeyUtilImpl : public OwnerKeyUtil { private: // The file that holds the public key. - FilePath key_file_; + base::FilePath key_file_; DISALLOW_COPY_AND_ASSIGN(OwnerKeyUtilImpl); }; diff --git a/chrome/browser/chromeos/system/name_value_pairs_parser.h b/chrome/browser/chromeos/system/name_value_pairs_parser.h index b35cd4c..a41a5ad5 100644 --- a/chrome/browser/chromeos/system/name_value_pairs_parser.h +++ b/chrome/browser/chromeos/system/name_value_pairs_parser.h @@ -10,7 +10,9 @@ #include "base/basictypes.h" +namespace base { class FilePath; +} namespace chromeos { namespace system { @@ -36,7 +38,7 @@ class NameValuePairsParser { // Parses name-value pairs from the file. // Returns false if there was any error in the file. Valid pairs will still be // added to the map. - bool GetNameValuePairsFromFile(const FilePath& file_path, + bool GetNameValuePairsFromFile(const base::FilePath& file_path, const std::string& eq, const std::string& delim); diff --git a/chrome/browser/component_updater/component_updater_service.h b/chrome/browser/component_updater/component_updater_service.h index 43a083f..ce17de0 100644 --- a/chrome/browser/component_updater/component_updater_service.h +++ b/chrome/browser/component_updater/component_updater_service.h @@ -11,14 +11,13 @@ #include "base/version.h" #include "googleurl/src/gurl.h" -class FilePath; - namespace net { class URLRequestContextGetter; } namespace base { class DictionaryValue; +class FilePath; } // Component specific installers must derive from this class and implement @@ -36,7 +35,7 @@ class ComponentInstaller { // json dictionary and |unpack_path| contains the temporary directory // with all the unpacked CRX files. virtual bool Install(base::DictionaryValue* manifest, - const FilePath& unpack_path) = 0; + const base::FilePath& unpack_path) = 0; protected: virtual ~ComponentInstaller() {} diff --git a/chrome/browser/devtools/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h index 42fcb7d..e97e5bd 100644 --- a/chrome/browser/devtools/devtools_file_helper.h +++ b/chrome/browser/devtools/devtools_file_helper.h @@ -14,9 +14,12 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -class FilePath; class Profile; +namespace base { +class FilePath; +} + namespace content { class WebContents; } @@ -84,19 +87,21 @@ class DevToolsFileHelper { void SaveAsFileSelected(const std::string& url, const std::string& content, const SaveCallback& callback, - const FilePath& path); + const base::FilePath& path); void SaveAsFileSelectionCanceled(); void InnerAddFileSystem(const AddFileSystemCallback& callback, - const FilePath& path); - void AddValidatedFileSystem(const AddFileSystemCallback& callback, - const std::vector<FilePath>& permitted_paths); - void RestoreValidatedFileSystems(const RequestFileSystemsCallback& callback, - const std::vector<FilePath>& file_paths); + const base::FilePath& path); + void AddValidatedFileSystem( + const AddFileSystemCallback& callback, + const std::vector<base::FilePath>& permitted_paths); + void RestoreValidatedFileSystems( + const RequestFileSystemsCallback& callback, + const std::vector<base::FilePath>& file_paths); content::WebContents* web_contents_; Profile* profile_; base::WeakPtrFactory<DevToolsFileHelper> weak_factory_; - typedef std::map<std::string, FilePath> PathsMap; + typedef std::map<std::string, base::FilePath> PathsMap; PathsMap saved_files_; DISALLOW_COPY_AND_ASSIGN(DevToolsFileHelper); }; diff --git a/chrome/browser/diagnostics/diagnostics_test.h b/chrome/browser/diagnostics/diagnostics_test.h index 571145b..d1c430a 100644 --- a/chrome/browser/diagnostics/diagnostics_test.h +++ b/chrome/browser/diagnostics/diagnostics_test.h @@ -9,7 +9,9 @@ #include "base/string16.h" #include "chrome/browser/diagnostics/diagnostics_model.h" +namespace base { class FilePath; +} // Represents a single diagnostic test and encapsulates the common // functionality across platforms as well. @@ -55,7 +57,7 @@ class DiagnosticTest : public DiagnosticsModel::TestInfo { void RecordOutcome(const string16& additional_info, DiagnosticsModel::TestResult result); - static FilePath GetUserDefaultProfileDir(); + static base::FilePath GetUserDefaultProfileDir(); protected: // The id needs to be overridden by derived classes and must uniquely diff --git a/chrome/browser/download/download_file_picker.h b/chrome/browser/download/download_file_picker.h index 28f661b..b7dc8b4 100644 --- a/chrome/browser/download/download_file_picker.h +++ b/chrome/browser/download/download_file_picker.h @@ -8,7 +8,9 @@ #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "ui/shell_dialogs/select_file_dialog.h" +namespace base { class FilePath; +} namespace content { class DownloadItem; @@ -24,7 +26,7 @@ class DownloadFilePicker : public ui::SelectFileDialog::Listener { void Init(content::DownloadManager* download_manager, content::DownloadItem* item, - const FilePath& suggested_path, + const base::FilePath& suggested_path, const ChromeDownloadManagerDelegate::FileSelectedCallback& callback); @@ -33,28 +35,28 @@ class DownloadFilePicker : public ui::SelectFileDialog::Listener { // method should be overridden to set the correct suggested path to prompt the // user. virtual void InitSuggestedPath(content::DownloadItem* item, - const FilePath& suggested_path); + const base::FilePath& suggested_path); - void set_suggested_path(const FilePath& suggested_path) { + void set_suggested_path(const base::FilePath& suggested_path) { suggested_path_ = suggested_path; } // Runs |file_selected_callback_| with |path| and then deletes this object. - void OnFileSelected(const FilePath& path); + void OnFileSelected(const base::FilePath& path); - void RecordFileSelected(const FilePath& path); + void RecordFileSelected(const base::FilePath& path); scoped_refptr<content::DownloadManager> download_manager_; int32 download_id_; private: // SelectFileDialog::Listener implementation. - virtual void FileSelected(const FilePath& path, + virtual void FileSelected(const base::FilePath& path, int index, void* params) OVERRIDE; virtual void FileSelectionCanceled(void* params) OVERRIDE; - FilePath suggested_path_; + base::FilePath suggested_path_; ChromeDownloadManagerDelegate::FileSelectedCallback file_selected_callback_; diff --git a/chrome/browser/download/download_path_reservation_tracker.h b/chrome/browser/download/download_path_reservation_tracker.h index 9bfeea7..7c7775b 100644 --- a/chrome/browser/download/download_path_reservation_tracker.h +++ b/chrome/browser/download/download_path_reservation_tracker.h @@ -63,12 +63,14 @@ // It considers 'foo/bar/x.pdf' and 'foo/baz/x.pdf' to be two different paths, // even though 'bar' might be a symlink to 'baz'. +namespace base { +class FilePath; +} + namespace content { class DownloadItem; } -class FilePath; - // Issues and tracks download paths that are in use by the download system. When // a target path is set for a download, this object tracks the path and the // associated download item so that subsequent downloads can avoid using the @@ -84,7 +86,7 @@ class DownloadPathReservationTracker { // // If |requested_target_path| was not writeable, then the parent directory of // |target_path| may be different from that of |requested_target_path|. - typedef base::Callback<void(const FilePath& target_path, + typedef base::Callback<void(const base::FilePath& target_path, bool target_path_verified)> ReservedPathCallback; // The largest index for the uniquification suffix that we will try while @@ -99,14 +101,14 @@ class DownloadPathReservationTracker { // directory does not exist and is the parent directory of // |requested_target_path|, the directory will be created. static void GetReservedPath(content::DownloadItem& download_item, - const FilePath& requested_target_path, - const FilePath& default_download_path, + const base::FilePath& requested_target_path, + const base::FilePath& default_download_path, bool should_uniquify_path, const ReservedPathCallback& callback); // Returns true if |path| is in use by an existing path reservation. Should // only be called on the FILE thread. Currently only used by tests. - static bool IsPathInUseForTesting(const FilePath& path); + static bool IsPathInUseForTesting(const base::FilePath& path); }; #endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PATH_RESERVATION_TRACKER_H_ diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h index aac4a9c..0d78ab0 100644 --- a/chrome/browser/enumerate_modules_model_win.h +++ b/chrome/browser/enumerate_modules_model_win.h @@ -17,9 +17,9 @@ #include "googleurl/src/gurl.h" class EnumerateModulesModel; -class FilePath; namespace base { +class FilePath; class ListValue; } @@ -191,7 +191,7 @@ class ModuleEnumerator : public base::RefCountedThreadSafe<ModuleEnumerator> { // Given a filename, returns the Subject (who signed it) retrieved from // the digital signature (Authenticode). - string16 GetSubjectNameFromDigitalSignature(const FilePath& filename); + string16 GetSubjectNameFromDigitalSignature(const base::FilePath& filename); // The typedef for the vector that maps a regular file path to %env_var%. typedef std::vector< std::pair<string16, string16> > PathMapping; diff --git a/chrome/browser/extensions/activity_database.h b/chrome/browser/extensions/activity_database.h index 89daecf..1c73dc9 100644 --- a/chrome/browser/extensions/activity_database.h +++ b/chrome/browser/extensions/activity_database.h @@ -14,7 +14,9 @@ #include "sql/connection.h" #include "sql/init_status.h" +namespace base { class FilePath; +} namespace extensions { @@ -30,7 +32,7 @@ class ActivityDatabase : public base::RefCountedThreadSafe<ActivityDatabase> { void SetErrorDelegate(sql::ErrorDelegate* error_delegate); // Opens the DB and creates tables as necessary. - void Init(const FilePath& db_name); + void Init(const base::FilePath& db_name); void LogInitFailure(); // Record a UrlAction in the database. diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index 1b12fd5..44e2259 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -17,9 +17,8 @@ #include "chrome/browser/extensions/extension_function.h" #include "ui/shell_dialogs/select_file_dialog.h" -class FilePath; - namespace base { +class FilePath; class ListValue; } @@ -274,10 +273,10 @@ class BookmarksIOFunction : public BookmarksFunction, public: BookmarksIOFunction(); - virtual void FileSelected(const FilePath& path, int index, void* params) = 0; + virtual void FileSelected(const base::FilePath& path, int index, void* params) = 0; // ui::SelectFileDialog::Listener: - virtual void MultiFilesSelected(const std::vector<FilePath>& files, + virtual void MultiFilesSelected(const std::vector<base::FilePath>& files, void* params) OVERRIDE; virtual void FileSelectionCanceled(void* params) OVERRIDE; @@ -289,7 +288,7 @@ class BookmarksIOFunction : public BookmarksFunction, private: void ShowSelectFileDialog( ui::SelectFileDialog::Type type, - const FilePath& default_path); + const base::FilePath& default_path); protected: scoped_refptr<ui::SelectFileDialog> select_file_dialog_; @@ -300,7 +299,7 @@ class BookmarksImportFunction : public BookmarksIOFunction { DECLARE_EXTENSION_FUNCTION("bookmarks.import", BOOKMARKS_IMPORT) // BookmarkManagerIOFunction: - virtual void FileSelected(const FilePath& path, + virtual void FileSelected(const base::FilePath& path, int index, void* params) OVERRIDE; @@ -316,7 +315,7 @@ class BookmarksExportFunction : public BookmarksIOFunction { DECLARE_EXTENSION_FUNCTION("bookmarks.export", BOOKMARKS_EXPORT) // BookmarkManagerIOFunction: - virtual void FileSelected(const FilePath& path, + virtual void FileSelected(const base::FilePath& path, int index, void* params) OVERRIDE; diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h index e18511e..5062ab4 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/extension_function.h" #include "chrome/browser/media_gallery/media_galleries_preferences.h" -class FilePath; class Profile; namespace extensions { diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h index b193fae..b46543e 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h @@ -19,7 +19,6 @@ #include "chrome/browser/media_gallery/media_galleries_preferences.h" #include "chrome/browser/system_monitor/removable_storage_observer.h" -class FilePath; class Profile; namespace base { diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.h b/chrome/browser/extensions/api/messaging/native_process_launcher.h index 41e735f..cbb9bd3 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.h +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.h @@ -8,7 +8,9 @@ #include "base/process.h" #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" +namespace base { class FilePath; +} namespace extensions { @@ -35,7 +37,7 @@ class NativeProcessLauncher { protected: static bool LaunchNativeProcess( - const FilePath& path, + const base::FilePath& path, base::ProcessHandle* native_process_handle, base::PlatformFile* read_file, base::PlatformFile* write_file); diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.h b/chrome/browser/extensions/api/page_capture/page_capture_api.h index 4d7e80f..e2d6ac4 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.h +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.h @@ -12,7 +12,9 @@ #include "chrome/common/extensions/api/page_capture.h" #include "webkit/blob/shareable_file_reference.h" +namespace base { class FilePath; +} namespace content { class WebContents; @@ -29,7 +31,7 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction { public: // Called on the UI thread when the temporary file that contains the // generated data has been created. - virtual void OnTemporaryFileCreated(const FilePath& temp_file) = 0; + virtual void OnTemporaryFileCreated(const base::FilePath& temp_file) = 0; }; static void SetTestDelegate(TestDelegate* delegate); @@ -48,7 +50,7 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction { void ReturnSuccess(int64 file_size); // Callback called once the MHTML generation is done. - void MHTMLGenerated(const FilePath& file_path, int64 mhtml_file_size); + void MHTMLGenerated(const base::FilePath& file_path, int64 mhtml_file_size); // Returns the WebContents we are associated with, NULL if it's been closed. content::WebContents* GetWebContents(); @@ -56,7 +58,7 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction { scoped_ptr<extensions::api::page_capture::SaveAsMHTML::Params> params_; // The path to the temporary file containing the MHTML data. - FilePath mhtml_path_; + base::FilePath mhtml_path_; // The file containing the MHTML. scoped_refptr<webkit_blob::ShareableFileReference> mhtml_file_; diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h index 8438b45..64909ac 100644 --- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h @@ -13,7 +13,9 @@ #include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h" #include "chrome/browser/extensions/api/storage/value_store_cache.h" +namespace base { class FilePath; +} namespace extensions { @@ -30,7 +32,7 @@ class SyncOrLocalValueStoreCache : public ValueStoreCache { const scoped_refptr<SettingsStorageFactory>& factory, const SettingsStorageQuotaEnforcer::Limits& quota, const scoped_refptr<SettingsObserverList>& observers, - const FilePath& profile_path); + const base::FilePath& profile_path); virtual ~SyncOrLocalValueStoreCache(); SettingsBackend* GetAppBackend() const; @@ -48,7 +50,7 @@ class SyncOrLocalValueStoreCache : public ValueStoreCache { void InitOnFileThread(const scoped_refptr<SettingsStorageFactory>& factory, const SettingsStorageQuotaEnforcer::Limits& quota, const scoped_refptr<SettingsObserverList>& observers, - const FilePath& profile_path); + const base::FilePath& profile_path); settings_namespace::Namespace settings_namespace_; scoped_ptr<SettingsBackend> app_backend_; diff --git a/chrome/browser/extensions/app_notification_manager.h b/chrome/browser/extensions/app_notification_manager.h index 405b349..4fa6e30 100644 --- a/chrome/browser/extensions/app_notification_manager.h +++ b/chrome/browser/extensions/app_notification_manager.h @@ -119,7 +119,7 @@ class AppNotificationManager virtual ~AppNotificationManager(); // Starts loading storage_ using |storage_path|. - void LoadOnFileThread(const FilePath& storage_path); + void LoadOnFileThread(const base::FilePath& storage_path); // Called on the UI thread to handle the loaded results from storage_. void HandleLoadResults(NotificationMap* map); diff --git a/chrome/browser/extensions/app_notification_storage.h b/chrome/browser/extensions/app_notification_storage.h index 1daf6b2..5fda2fd 100644 --- a/chrome/browser/extensions/app_notification_storage.h +++ b/chrome/browser/extensions/app_notification_storage.h @@ -9,7 +9,9 @@ #include "chrome/browser/extensions/app_notification.h" +namespace base { class FilePath; +} namespace extensions { @@ -20,7 +22,7 @@ namespace extensions { class AppNotificationStorage { public: // Must be called on the FILE thread. The storage will be created at |path|. - static AppNotificationStorage* Create(const FilePath& path); + static AppNotificationStorage* Create(const base::FilePath& path); virtual ~AppNotificationStorage(); diff --git a/chrome/browser/extensions/convert_user_script.h b/chrome/browser/extensions/convert_user_script.h index fa02f90..b5937773 100644 --- a/chrome/browser/extensions/convert_user_script.h +++ b/chrome/browser/extensions/convert_user_script.h @@ -10,9 +10,12 @@ #include "base/memory/ref_counted.h" #include "base/string16.h" -class FilePath; class GURL; +namespace base { +class FilePath; +} + namespace extensions { class Extension; @@ -24,8 +27,8 @@ class Extension; // NOTE: The caller takes ownership of the directory at extension->path() on the // returned object. scoped_refptr<extensions::Extension> ConvertUserScriptToExtension( - const FilePath& user_script, const GURL& original_url, - const FilePath& extensions_dir, string16* error); + const base::FilePath& user_script, const GURL& original_url, + const base::FilePath& extensions_dir, string16* error); } // namespace extensions diff --git a/chrome/browser/extensions/convert_web_app.h b/chrome/browser/extensions/convert_web_app.h index 78d80f9..77c03d5 100644 --- a/chrome/browser/extensions/convert_web_app.h +++ b/chrome/browser/extensions/convert_web_app.h @@ -9,9 +9,8 @@ #include "base/memory/ref_counted.h" -class FilePath; - namespace base { +class FilePath; class Time; } @@ -41,7 +40,7 @@ std::string ConvertTimeToExtensionVersion(const base::Time& time); scoped_refptr<Extension> ConvertWebAppToExtension( const WebApplicationInfo& web_app_info, const base::Time& create_time, - const FilePath& extensions_dir); + const base::FilePath& extensions_dir); } // namespace extensions diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index 143f9fd..8d3d2e0 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h @@ -13,13 +13,14 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "content/public/browser/notification_registrar.h" +namespace base { class FilePath; +} namespace extensions { class Extension; } - // The general flow of these API tests should work like this: // (1) Setup initial browser state (e.g. create some bookmarks for the // bookmark test) @@ -158,7 +159,7 @@ class ExtensionApiTest : public ExtensionBrowserTest { // Start the test WebSocket server, and store details of its state. Those // details will be available to javascript tests using // chrome.test.getConfig(). - bool StartWebSocketServer(const FilePath& root_directory); + bool StartWebSocketServer(const base::FilePath& root_directory); // Test that exactly one extension loaded. If so, return a pointer to // the extension. If not, return NULL and set message_. diff --git a/chrome/browser/extensions/extension_creator.h b/chrome/browser/extensions/extension_creator.h index 86243ba..de7aa76 100644 --- a/chrome/browser/extensions/extension_creator.h +++ b/chrome/browser/extensions/extension_creator.h @@ -10,12 +10,14 @@ #include "base/basictypes.h" +namespace base { +class FilePath; +} + namespace crypto { class RSAPrivateKey; } -class FilePath; - namespace extensions { // This class create an installable extension (.crx file) given an input @@ -37,10 +39,10 @@ class ExtensionCreator { // Categories of error that may need special handling on the UI end. enum ErrorType { kOtherError, kCRXExists }; - bool Run(const FilePath& extension_dir, - const FilePath& crx_path, - const FilePath& private_key_path, - const FilePath& private_key_output_path, + bool Run(const base::FilePath& extension_dir, + const base::FilePath& crx_path, + const base::FilePath& private_key_path, + const base::FilePath& private_key_output_path, int run_flags); // Returns the error message that will be present if Run(...) returned false. @@ -56,38 +58,38 @@ class ExtensionCreator { // the extension. If not provided, a random key will be created (in which case // it is written to |private_key_output_path| -- if provided). // |flags| is a bitset of RunFlags values. - bool InitializeInput(const FilePath& extension_dir, - const FilePath& crx_path, - const FilePath& private_key_path, - const FilePath& private_key_output_path, + bool InitializeInput(const base::FilePath& extension_dir, + const base::FilePath& crx_path, + const base::FilePath& private_key_path, + const base::FilePath& private_key_output_path, int run_flags); // Validates the manifest by trying to load the extension. - bool ValidateManifest(const FilePath& extension_dir, + bool ValidateManifest(const base::FilePath& extension_dir, crypto::RSAPrivateKey* key_pair, int run_flags); // Reads private key from |private_key_path|. - crypto::RSAPrivateKey* ReadInputKey(const FilePath& private_key_path); + crypto::RSAPrivateKey* ReadInputKey(const base::FilePath& private_key_path); // Generates a key pair and writes the private key to |private_key_path| // if provided. - crypto::RSAPrivateKey* GenerateKey(const FilePath& private_key_path); + crypto::RSAPrivateKey* GenerateKey(const base::FilePath& private_key_path); // Creates temporary zip file for the extension. - bool CreateZip(const FilePath& extension_dir, const FilePath& temp_path, - FilePath* zip_path); + bool CreateZip(const base::FilePath& extension_dir, const base::FilePath& temp_path, + base::FilePath* zip_path); // Signs the temporary zip and returns the signature. - bool SignZip(const FilePath& zip_path, + bool SignZip(const base::FilePath& zip_path, crypto::RSAPrivateKey* private_key, std::vector<uint8>* signature); // Export installable .crx to |crx_path|. - bool WriteCRX(const FilePath& zip_path, + bool WriteCRX(const base::FilePath& zip_path, crypto::RSAPrivateKey* private_key, const std::vector<uint8>& signature, - const FilePath& crx_path); + const base::FilePath& crx_path); // Holds a message for any error that is raised during Run(...). std::string error_message_; diff --git a/chrome/browser/extensions/extension_creator_filter.h b/chrome/browser/extensions/extension_creator_filter.h index c13e2c2..6c0aac6 100644 --- a/chrome/browser/extensions/extension_creator_filter.h +++ b/chrome/browser/extensions/extension_creator_filter.h @@ -7,7 +7,9 @@ #include "base/memory/ref_counted.h" +namespace base { class FilePath; +} namespace extensions { @@ -18,9 +20,9 @@ class ExtensionCreatorFilter public: ExtensionCreatorFilter() {} - // Returns true if the given FilePath should be included in a + // Returns true if the given base::FilePath should be included in a // packed extension. - bool ShouldPackageFile(const FilePath& file_path); + bool ShouldPackageFile(const base::FilePath& file_path); private: friend class base::RefCounted<ExtensionCreatorFilter>; diff --git a/chrome/browser/extensions/external_provider_interface.h b/chrome/browser/extensions/external_provider_interface.h index 1d1f098..2017386 100644 --- a/chrome/browser/extensions/external_provider_interface.h +++ b/chrome/browser/extensions/external_provider_interface.h @@ -10,10 +10,13 @@ #include "base/memory/linked_ptr.h" #include "chrome/common/extensions/manifest.h" -class FilePath; class GURL; class Version; +namespace base { +class FilePath; +} + namespace extensions { // This class is an abstract class for implementing external extensions @@ -33,7 +36,7 @@ class ExternalProviderInterface { virtual bool OnExternalExtensionFileFound( const std::string& id, const Version* version, - const FilePath& path, + const base::FilePath& path, Manifest::Location location, int creation_flags, bool mark_acknowledged) = 0; diff --git a/chrome/browser/extensions/platform_app_launcher.h b/chrome/browser/extensions/platform_app_launcher.h index 9665641..ae9cfa5 100644 --- a/chrome/browser/extensions/platform_app_launcher.h +++ b/chrome/browser/extensions/platform_app_launcher.h @@ -8,9 +8,12 @@ #include <string> class CommandLine; -class FilePath; class Profile; +namespace base { +class FilePath; +} + namespace content { class WebContents; class WebIntentsDispatcher; @@ -27,20 +30,20 @@ class Extension; void LaunchPlatformApp(Profile* profile, const Extension* extension, const CommandLine* command_line, - const FilePath& current_directory); + const base::FilePath& current_directory); // Launches the platform app |extension| with the contents of |file_path| // available through the launch data. void LaunchPlatformAppWithPath(Profile* profile, const Extension* extension, - const FilePath& file_path); + const base::FilePath& file_path); // Launches the platform app |extension| with the contents of |file_path| // available through the launch data. void LaunchPlatformAppWithFileHandler(Profile* profile, const Extension* extension, const std::string& handler_id, - const FilePath& file_path); + const base::FilePath& file_path); #if defined(ENABLE_WEB_INTENTS) // Launches the platform app |extension| with the supplied web intent. Creates diff --git a/chrome/browser/extensions/test_extension_system.h b/chrome/browser/extensions/test_extension_system.h index 47faa2f..d17ac02 100644 --- a/chrome/browser/extensions/test_extension_system.h +++ b/chrome/browser/extensions/test_extension_system.h @@ -8,8 +8,9 @@ #include "chrome/browser/extensions/extension_system.h" class CommandLine; -class FilePath; + namespace base { +class FilePath; class Time; } @@ -27,7 +28,7 @@ class TestExtensionSystem : public ExtensionSystem { // Creates an ExtensionService initialized with the testing profile and // returns it. ExtensionService* CreateExtensionService(const CommandLine* command_line, - const FilePath& install_directory, + const base::FilePath& install_directory, bool autoupdate_enabled); // Creates an ExtensionProcessManager. If not invoked, the diff --git a/chrome/browser/extensions/updater/extension_downloader_delegate.h b/chrome/browser/extensions/updater/extension_downloader_delegate.h index dd0b6c1..58e0dc9 100644 --- a/chrome/browser/extensions/updater/extension_downloader_delegate.h +++ b/chrome/browser/extensions/updater/extension_downloader_delegate.h @@ -11,9 +11,12 @@ #include "base/time.h" #include "chrome/browser/extensions/updater/manifest_fetch_data.h" -class FilePath; class GURL; +namespace base { +class FilePath; +} + namespace extensions { class ExtensionDownloaderDelegate { @@ -80,7 +83,7 @@ class ExtensionDownloaderDelegate { // to the delegate. virtual void OnExtensionDownloadFinished( const std::string& id, - const FilePath& path, + const base::FilePath& path, const GURL& download_url, const std::string& version, const PingResult& ping_result, diff --git a/chrome/browser/extensions/webstore_installer.h b/chrome/browser/extensions/webstore_installer.h index b263f81..bda4aa0 100644 --- a/chrome/browser/extensions/webstore_installer.h +++ b/chrome/browser/extensions/webstore_installer.h @@ -21,9 +21,12 @@ #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" -class FilePath; class Profile; +namespace base { +class FilePath; +} + namespace content { class NavigationController; } @@ -142,7 +145,7 @@ class WebstoreInstaller :public content::NotificationObserver, // Instead of using the default download directory, use |directory| instead. // This does *not* transfer ownership of |directory|. - static void SetDownloadDirectoryForTests(FilePath* directory); + static void SetDownloadDirectoryForTests(base::FilePath* directory); private: friend struct content::BrowserThread::DeleteOnThread< @@ -158,7 +161,7 @@ class WebstoreInstaller :public content::NotificationObserver, virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE; // Starts downloading the extension to |file_path|. - void StartDownload(const FilePath& file_path); + void StartDownload(const base::FilePath& file_path); // Reports an install |error| to the delegate for the given extension if this // managed its installation. This also removes the associated PendingInstall. diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h index 970cdd4..cf93bcf 100644 --- a/chrome/browser/first_run/first_run.h +++ b/chrome/browser/first_run/first_run.h @@ -17,12 +17,15 @@ #include "ui/gfx/native_widget_types.h" class CommandLine; -class FilePath; class GURL; class PrefServiceSyncable; class Profile; class ProcessSingleton; +namespace base { +class FilePath; +} + // This namespace contains the chrome first-run installation actions needed to // fully test the custom installer. It also contains the opposite actions to // execute during uninstall. When the first run UI is ready we won't @@ -133,10 +136,10 @@ void DoPostImportTasks(Profile* profile, bool make_chrome_default); int ImportNow(Profile* profile, const CommandLine& cmdline); // Returns the path for the master preferences file. -FilePath MasterPrefsPath(); +base::FilePath MasterPrefsPath(); // Set a master preferences file path that overrides platform defaults. -void SetMasterPrefsPathForTesting(const FilePath& master_prefs); +void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs); // The master preferences is a JSON file with the same entries as the // 'Default\Preferences' file. This function locates this file from a standard @@ -152,7 +155,7 @@ void SetMasterPrefsPathForTesting(const FilePath& master_prefs); // See chrome/installer/util/master_preferences.h for a description of // 'master_preferences' file. ProcessMasterPreferencesResult ProcessMasterPreferences( - const FilePath& user_data_dir, + const base::FilePath& user_data_dir, MasterPrefs* out_prefs); // Show the first run search engine bubble at the first appropriate opportunity. diff --git a/chrome/browser/first_run/first_run_internal.h b/chrome/browser/first_run/first_run_internal.h index 9e56673..7f8bd14 100644 --- a/chrome/browser/first_run/first_run_internal.h +++ b/chrome/browser/first_run/first_run_internal.h @@ -14,7 +14,6 @@ #include "ui/gfx/native_widget_types.h" class CommandLine; -class FilePath; class GURL; class ImporterHost; class ImporterList; @@ -22,6 +21,10 @@ class Profile; class ProcessSingleton; class TemplateURLService; +namespace base { +class FilePath; +} + namespace installer { class MasterPreferences; } @@ -42,12 +45,12 @@ extern FirstRunState first_run_; // master preferences. Passes the master preference file path out in // master_prefs_path. Returns the pointer to installer::MasterPreferences object // if successful; otherwise, returns NULL. -installer::MasterPreferences* LoadMasterPrefs(FilePath* master_prefs_path); +installer::MasterPreferences* LoadMasterPrefs(base::FilePath* master_prefs_path); // Copies user preference file to master preference file. Returns true if // successful. -bool CopyPrefFile(const FilePath& user_data_dir, - const FilePath& master_prefs_path); +bool CopyPrefFile(const base::FilePath& user_data_dir, + const base::FilePath& master_prefs_path); // Sets up master preferences by preferences passed by installer. void SetupMasterPrefsFromInstallPrefs( @@ -75,7 +78,7 @@ void DoPostImportPlatformSpecificTasks(); // Gives the full path to the sentinel file. The file might not exist. // This function has a common implementation on OS_POSIX and a windows specific // implementation. -bool GetFirstRunSentinelFilePath(FilePath* path); +bool GetFirstRunSentinelFilePath(base::FilePath* path); // This function has a common implementationin for all non-linux platforms, and // a linux specific implementation. @@ -100,7 +103,7 @@ int ImportBookmarkFromFileIfNeeded(Profile* profile, const CommandLine& cmdline); #if !defined(OS_WIN) -bool ImportBookmarks(const FilePath& import_bookmarks_path); +bool ImportBookmarks(const base::FilePath& import_bookmarks_path); #endif // Shows the EULA dialog if required. Returns true if the EULA is accepted, diff --git a/chrome/browser/google_apis/drive_api_service.h b/chrome/browser/google_apis/drive_api_service.h index 45876d1..4da9568 100644 --- a/chrome/browser/google_apis/drive_api_service.h +++ b/chrome/browser/google_apis/drive_api_service.h @@ -14,10 +14,13 @@ #include "chrome/browser/google_apis/drive_api_url_generator.h" #include "chrome/browser/google_apis/drive_service_interface.h" -class FilePath; class GURL; class Profile; +namespace base { +class FilePath; +} + namespace net { class URLRequestContextGetter; } // namespace net @@ -51,7 +54,7 @@ class DriveAPIService : public DriveServiceInterface, virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE; virtual bool CanStartOperation() const OVERRIDE; virtual void CancelAll() OVERRIDE; - virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE; + virtual bool CancelForFilePath(const base::FilePath& file_path) OVERRIDE; virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE; virtual bool HasAccessToken() const OVERRIDE; virtual bool HasRefreshToken() const OVERRIDE; @@ -74,8 +77,8 @@ class DriveAPIService : public DriveServiceInterface, const std::string& resource_id, const EntryActionCallback& callback) OVERRIDE; virtual void DownloadFile( - const FilePath& virtual_path, - const FilePath& local_cache_path, + const base::FilePath& virtual_path, + const base::FilePath& local_cache_path, const GURL& content_url, const DownloadActionCallback& download_action_callback, const GetContentCallback& get_content_callback) OVERRIDE; diff --git a/chrome/browser/google_apis/drive_uploader.h b/chrome/browser/google_apis/drive_uploader.h index c0007288..4dc496b 100644 --- a/chrome/browser/google_apis/drive_uploader.h +++ b/chrome/browser/google_apis/drive_uploader.h @@ -15,17 +15,20 @@ #include "chrome/browser/google_apis/gdata_errorcode.h" #include "chrome/browser/google_apis/gdata_wapi_parser.h" -class FilePath; class GURL; +namespace base { +class FilePath; +} + namespace google_apis { class DriveServiceInterface; struct ResumeUploadResponse; // Callback to be invoked once the upload has completed. typedef base::Callback<void(DriveUploadError error, - const FilePath& drive_path, - const FilePath& file_path, + const base::FilePath& drive_path, + const base::FilePath& file_path, scoped_ptr<ResourceEntry> resource_entry)> UploadCompletionCallback; @@ -55,8 +58,8 @@ class DriveUploaderInterface { // Called when an upload is done regardless of it was successful or not. // Must not be null. virtual void UploadNewFile(const GURL& upload_location, - const FilePath& drive_file_path, - const FilePath& local_file_path, + const base::FilePath& drive_file_path, + const base::FilePath& local_file_path, const std::string& title, const std::string& content_type, const UploadCompletionCallback& callback) = 0; @@ -70,8 +73,8 @@ class DriveUploaderInterface { // fails with UPLOAD_ERROR_CONFLICT. // If |etag| is empty, the test is skipped. virtual void UploadExistingFile(const GURL& upload_location, - const FilePath& drive_file_path, - const FilePath& local_file_path, + const base::FilePath& drive_file_path, + const base::FilePath& local_file_path, const std::string& content_type, const std::string& etag, const UploadCompletionCallback& callback) = 0; @@ -84,15 +87,15 @@ class DriveUploader : public DriveUploaderInterface { // DriveUploaderInterface overrides. virtual void UploadNewFile(const GURL& upload_location, - const FilePath& drive_file_path, - const FilePath& local_file_path, + const base::FilePath& drive_file_path, + const base::FilePath& local_file_path, const std::string& title, const std::string& content_type, const UploadCompletionCallback& callback) OVERRIDE; virtual void UploadExistingFile( const GURL& upload_location, - const FilePath& drive_file_path, - const FilePath& local_file_path, + const base::FilePath& drive_file_path, + const base::FilePath& local_file_path, const std::string& content_type, const std::string& etag, const UploadCompletionCallback& callback) OVERRIDE; diff --git a/chrome/browser/google_apis/gdata_wapi_parser.h b/chrome/browser/google_apis/gdata_wapi_parser.h index 8f5c8f7..2d973af 100644 --- a/chrome/browser/google_apis/gdata_wapi_parser.h +++ b/chrome/browser/google_apis/gdata_wapi_parser.h @@ -17,12 +17,13 @@ #include "chrome/browser/google_apis/drive_entry_kinds.h" #include "googleurl/src/gurl.h" -class FilePath; class Profile; namespace base { -class Value; +class FilePath; class DictionaryValue; +class Value; + template <class StructType> class JSONValueConverter; @@ -421,7 +422,7 @@ class ResourceEntry : public FeedEntry { static bool ParseChangestamp(const base::Value* value, int64* result); // Returns true if |file| has one of the hosted document extensions. - static bool HasHostedDocumentExtension(const FilePath& file); + static bool HasHostedDocumentExtension(const base::FilePath& file); // The resource ID is used to identify a resource, which looks like: // file:d41d8cd98f00b204e9800998ecf8 diff --git a/chrome/browser/google_apis/gdata_wapi_service.h b/chrome/browser/google_apis/gdata_wapi_service.h index 2866a7c..b454f2e 100644 --- a/chrome/browser/google_apis/gdata_wapi_service.h +++ b/chrome/browser/google_apis/gdata_wapi_service.h @@ -15,10 +15,13 @@ #include "chrome/browser/google_apis/gdata_wapi_operations.h" #include "chrome/browser/google_apis/gdata_wapi_url_generator.h" -class FilePath; class GURL; class Profile; +namespace base { +class FilePath; +} + namespace net { class URLRequestContextGetter; } // namespace net @@ -55,7 +58,7 @@ class GDataWapiService : public DriveServiceInterface, virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE; virtual bool CanStartOperation() const OVERRIDE; virtual void CancelAll() OVERRIDE; - virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE; + virtual bool CancelForFilePath(const base::FilePath& file_path) OVERRIDE; virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE; virtual bool HasAccessToken() const OVERRIDE; virtual bool HasRefreshToken() const OVERRIDE; @@ -76,8 +79,8 @@ class GDataWapiService : public DriveServiceInterface, virtual void DeleteResource(const std::string& resource_id, const EntryActionCallback& callback) OVERRIDE; virtual void DownloadFile( - const FilePath& virtual_path, - const FilePath& local_cache_path, + const base::FilePath& virtual_path, + const base::FilePath& local_cache_path, const GURL& content_url, const DownloadActionCallback& download_action_callback, const GetContentCallback& get_content_callback) OVERRIDE; diff --git a/chrome/browser/google_apis/mock_drive_service.h b/chrome/browser/google_apis/mock_drive_service.h index 42cbfe9..eb8a9dc 100644 --- a/chrome/browser/google_apis/mock_drive_service.h +++ b/chrome/browser/google_apis/mock_drive_service.h @@ -13,7 +13,9 @@ #include "chrome/browser/google_apis/drive_service_interface.h" #include "testing/gmock/include/gmock/gmock.h" +namespace base { class FilePath; +} namespace google_apis { @@ -30,7 +32,7 @@ class MockDriveService : public DriveServiceInterface { void(DriveServiceObserver* observer)); MOCK_CONST_METHOD0(CanStartOperation, bool()); MOCK_METHOD0(CancelAll, void(void)); - MOCK_METHOD1(CancelForFilePath, bool(const FilePath& file_path)); + MOCK_METHOD1(CancelForFilePath, bool(const base::FilePath& file_path)); MOCK_CONST_METHOD0(GetProgressStatusList, OperationProgressStatusList()); MOCK_CONST_METHOD0(GetRootResourceId, std::string()); @@ -72,8 +74,8 @@ class MockDriveService : public DriveServiceInterface { const GetResourceEntryCallback& callback)); MOCK_METHOD5( DownloadFile, - void(const FilePath& virtual_path, - const FilePath& local_cache_path, + void(const base::FilePath& virtual_path, + const base::FilePath& local_cache_path, const GURL& content_url, const DownloadActionCallback& donwload_action_callback, @@ -151,8 +153,8 @@ class MockDriveService : public DriveServiceInterface { // portion of the URL as the temporary file path. If |file_data_| is not null, // |file_data_| is written to the temporary file. void DownloadFileStub( - const FilePath& virtual_path, - const FilePath& local_tmp_path, + const base::FilePath& virtual_path, + const base::FilePath& local_tmp_path, const GURL& content_url, const DownloadActionCallback& download_action_callback, const GetContentCallback& get_content_callback); diff --git a/chrome/browser/google_apis/test_util.h b/chrome/browser/google_apis/test_util.h index e0ba436..38a1051 100644 --- a/chrome/browser/google_apis/test_util.h +++ b/chrome/browser/google_apis/test_util.h @@ -11,9 +11,8 @@ #include "chrome/browser/google_apis/gdata_errorcode.h" #include "googleurl/src/gurl.h" -class FilePath; - namespace base { +class FilePath; class Value; } @@ -42,7 +41,7 @@ void RunBlockingPoolTask(); // Returns the absolute path for a test file stored under // chrome/test/data/chromeos. -FilePath GetTestFilePath(const std::string& relative_path); +base::FilePath GetTestFilePath(const std::string& relative_path); // Returns the base URL for communicating with the local test server for // testing, running at the specified port number. @@ -103,13 +102,13 @@ void CopyResultsFromGetAppListCallback( // Copies the results from DownloadActionCallback. void CopyResultsFromDownloadActionCallback( GDataErrorCode* error_out, - FilePath* temp_file_out, + base::FilePath* temp_file_out, GDataErrorCode error_in, - const FilePath& temp_file_in); + const base::FilePath& temp_file_in); // Returns a HttpResponse created from the given file path. scoped_ptr<test_server::HttpResponse> CreateHttpResponseFromFile( - const FilePath& file_path); + const base::FilePath& file_path); // Does nothing for ReAuthenticateCallback(). This function should be used // if it is not expected to reach this method as there won't be any @@ -120,7 +119,7 @@ void DoNothingForReAuthenticateCallback( // Returns true if |json_data| is not NULL and equals to the content in // |expected_json_file_path|. The failure reason will be logged into LOG(ERROR) // if necessary. -bool VerifyJsonData(const FilePath& expected_json_file_path, +bool VerifyJsonData(const base::FilePath& expected_json_file_path, const base::Value* json_data); } // namespace test_util diff --git a/chrome/browser/google_apis/time_util.h b/chrome/browser/google_apis/time_util.h index f40aecc..222045b 100644 --- a/chrome/browser/google_apis/time_util.h +++ b/chrome/browser/google_apis/time_util.h @@ -9,7 +9,6 @@ #include "base/string_piece.h" -class FilePath; class Profile; namespace base { diff --git a/chrome/browser/history/archived_database.cc b/chrome/browser/history/archived_database.cc index 3eae2d6..b80509e 100644 --- a/chrome/browser/history/archived_database.cc +++ b/chrome/browser/history/archived_database.cc @@ -24,7 +24,7 @@ ArchivedDatabase::ArchivedDatabase() { ArchivedDatabase::~ArchivedDatabase() { } -bool ArchivedDatabase::Init(const FilePath& file_name) { +bool ArchivedDatabase::Init(const base::FilePath& file_name) { // Set the database page size to something a little larger to give us // better performance (we're typically seek rather than bandwidth limited). // This only has an effect before any tables have been created, otherwise diff --git a/chrome/browser/history/archived_database.h b/chrome/browser/history/archived_database.h index b157f66..0fe7184 100644 --- a/chrome/browser/history/archived_database.h +++ b/chrome/browser/history/archived_database.h @@ -12,7 +12,9 @@ #include "sql/init_status.h" #include "sql/meta_table.h" +namespace base { class FilePath; +} namespace history { @@ -30,7 +32,7 @@ class ArchivedDatabase : public URLDatabase, // Initializes the database connection. This must return true before any other // functions on this class are called. - bool Init(const FilePath& file_name); + bool Init(const base::FilePath& file_name); // Transactions on the database. We support nested transactions and only // commit when the outermost one is committed (sqlite doesn't support true diff --git a/chrome/browser/history/download_database.h b/chrome/browser/history/download_database.h index 8cf07ab..929b097 100644 --- a/chrome/browser/history/download_database.h +++ b/chrome/browser/history/download_database.h @@ -11,8 +11,6 @@ #include "base/threading/platform_thread.h" #include "sql/meta_table.h" -class FilePath; - namespace sql { class Connection; } diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h index b374260..981c8a5 100644 --- a/chrome/browser/history/history_database.h +++ b/chrome/browser/history/history_database.h @@ -23,7 +23,9 @@ #include "chrome/browser/history/android/android_urls_database.h" #endif +namespace base { class FilePath; +} namespace history { @@ -67,7 +69,7 @@ class HistoryDatabase : public DownloadDatabase, // Must call this function to complete initialization. Will return // sql::INIT_OK on success. Otherwise, no other function should be called. You // may want to call BeginExclusiveMode after this when you are ready. - sql::InitStatus Init(const FilePath& history_name, + sql::InitStatus Init(const base::FilePath& history_name, sql::ErrorDelegate* error_delegate); // Call to set the mode on the database to exclusive. The default locking mode diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index bd7307f..c778783 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -40,7 +40,6 @@ #endif class BookmarkService; -class FilePath; class GURL; class HistoryURLProvider; class PageUsageData; @@ -49,6 +48,7 @@ class Profile; struct HistoryURLProviderParams; namespace base { +class FilePath; class Thread; } @@ -129,7 +129,7 @@ class HistoryService : public CancelableRequestProvider, // not call any other functions. The given directory will be used for storing // the history files. The BookmarkService is used when deleting URLs to // test if a URL is bookmarked; it may be NULL during testing. - bool Init(const FilePath& history_dir, BookmarkService* bookmark_service) { + bool Init(const base::FilePath& history_dir, BookmarkService* bookmark_service) { return Init(history_dir, bookmark_service, false); } @@ -666,7 +666,7 @@ class HistoryService : public CancelableRequestProvider, // Low-level Init(). Same as the public version, but adds a |no_db| parameter // that is only set by unittests which causes the backend to not init its DB. - bool Init(const FilePath& history_dir, + bool Init(const base::FilePath& history_dir, BookmarkService* bookmark_service, bool no_db); @@ -1094,7 +1094,7 @@ class HistoryService : public CancelableRequestProvider, int current_backend_id_; // Cached values from Init(), used whenever we need to reload the backend. - FilePath history_dir_; + base::FilePath history_dir_; BookmarkService* bookmark_service_; bool no_db_; diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h index 17cb6f1..b729686 100644 --- a/chrome/browser/history/in_memory_database.h +++ b/chrome/browser/history/in_memory_database.h @@ -9,7 +9,9 @@ #include "chrome/browser/history/url_database.h" #include "sql/connection.h" +namespace base { class FilePath; +} namespace history { @@ -28,7 +30,7 @@ class InMemoryDatabase : public URLDatabase { // file. Conceptually, the InMemoryHistoryBackend should do the populating // after this object does some common initialization, but that would be // much slower. - bool InitFromDisk(const FilePath& history_name); + bool InitFromDisk(const base::FilePath& history_name); protected: // Implemented for URLDatabase. diff --git a/chrome/browser/history/in_memory_history_backend.cc b/chrome/browser/history/in_memory_history_backend.cc index b0dac72..f75d1c9 100644 --- a/chrome/browser/history/in_memory_history_backend.cc +++ b/chrome/browser/history/in_memory_history_backend.cc @@ -27,7 +27,7 @@ InMemoryHistoryBackend::InMemoryHistoryBackend() InMemoryHistoryBackend::~InMemoryHistoryBackend() {} -bool InMemoryHistoryBackend::Init(const FilePath& history_filename, +bool InMemoryHistoryBackend::Init(const base::FilePath& history_filename, URLDatabase* db) { db_.reset(new InMemoryDatabase); return db_->InitFromDisk(history_filename); diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h index addfac9..a2d1f72 100644 --- a/chrome/browser/history/in_memory_history_backend.h +++ b/chrome/browser/history/in_memory_history_backend.h @@ -21,10 +21,13 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -class FilePath; class GURL; class Profile; +namespace base { +class FilePath; +} + namespace history { class InMemoryDatabase; @@ -42,7 +45,7 @@ class InMemoryHistoryBackend : public content::NotificationObserver { // Initializes the backend from the history database pointed to by the // full path in |history_filename|. |db| is used for setting up the // InMemoryDatabase. - bool Init(const FilePath& history_filename, URLDatabase* db); + bool Init(const base::FilePath& history_filename, URLDatabase* db); // Does initialization work when this object is attached to the history // system on the main thread. The argument is the profile with which the diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h index 9ee17c7..4e8f789 100644 --- a/chrome/browser/history/thumbnail_database.h +++ b/chrome/browser/history/thumbnail_database.h @@ -15,11 +15,11 @@ #include "sql/meta_table.h" #include "sql/statement.h" -class FilePath; struct ThumbnailScore; class SkBitmap; namespace base { +class FilePath; class RefCountedMemory; class Time; } @@ -47,7 +47,7 @@ class ThumbnailDatabase { // Must be called after creation but before any other methods are called. // When not INIT_OK, no other functions should be called. - sql::InitStatus Init(const FilePath& db_name, + sql::InitStatus Init(const base::FilePath& db_name, const HistoryPublisher* history_publisher, URLDatabase* url_database); @@ -56,7 +56,7 @@ class ThumbnailDatabase { // |db| is the database to open. // |db_name| is a path to the database file. static sql::InitStatus OpenDatabase(sql::Connection* db, - const FilePath& db_name); + const base::FilePath& db_name); // Transactions on the database. void BeginTransaction(); @@ -308,8 +308,8 @@ class ThumbnailDatabase { bool NeedsMigrationToTopSites(); // Renames the database file and drops the Thumbnails table. - bool RenameAndDropThumbnails(const FilePath& old_db_file, - const FilePath& new_db_file); + bool RenameAndDropThumbnails(const base::FilePath& old_db_file, + const base::FilePath& new_db_file); private: friend class ExpireHistoryBackend; diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h index e87f25d..7ea4fa6 100644 --- a/chrome/browser/history/top_sites.h +++ b/chrome/browser/history/top_sites.h @@ -29,10 +29,10 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/image/image.h" -class FilePath; class Profile; namespace base { +class FilePath; class RefCountedBytes; class RefCountedMemory; } @@ -57,7 +57,7 @@ class TopSites explicit TopSites(Profile* profile); // Initializes TopSites. - void Init(const FilePath& db_name); + void Init(const base::FilePath& db_name); // Sets the given thumbnail for the given URL. Returns true if the thumbnail // was updated. False means either the URL wasn't known to us, or we felt diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h index 163af2c..5028286 100644 --- a/chrome/browser/history/top_sites_backend.h +++ b/chrome/browser/history/top_sites_backend.h @@ -12,7 +12,10 @@ #include "chrome/browser/history/history_types.h" class CancelableTaskTracker; + +namespace base { class FilePath; +} namespace history { @@ -31,7 +34,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> { TopSitesBackend(); - void Init(const FilePath& path); + void Init(const base::FilePath& path); // Schedules the db to be shutdown. void Shutdown(); @@ -64,7 +67,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> { virtual ~TopSitesBackend(); // Invokes Init on the db_. - void InitDBOnDBThread(const FilePath& path); + void InitDBOnDBThread(const base::FilePath& path); // Shuts down the db. void ShutdownDBOnDBThread(); @@ -83,9 +86,9 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> { const Images& thumbnail); // Resets the database. - void ResetDatabaseOnDBThread(const FilePath& file_path); + void ResetDatabaseOnDBThread(const base::FilePath& file_path); - FilePath db_path_; + base::FilePath db_path_; scoped_ptr<TopSitesDatabase> db_; diff --git a/chrome/browser/history/top_sites_database.h b/chrome/browser/history/top_sites_database.h index 313c706..42e04ed 100644 --- a/chrome/browser/history/top_sites_database.h +++ b/chrome/browser/history/top_sites_database.h @@ -13,7 +13,9 @@ #include "chrome/browser/history/url_database.h" // For DBCloseScoper. #include "sql/meta_table.h" +namespace base { class FilePath; +} namespace sql { class Connection; @@ -28,7 +30,7 @@ class TopSitesDatabase { // Must be called after creation but before any other methods are called. // Returns true on success. If false, no other functions should be called. - bool Init(const FilePath& db_name); + bool Init(const base::FilePath& db_name); // Returns true if migration of top sites from history may be needed. A value // of true means either migration is definitely needed (the top sites file is @@ -92,7 +94,7 @@ class TopSitesDatabase { // Returns the number of URLs (rows) in the database. int GetRowCount(); - sql::Connection* CreateDB(const FilePath& db_name); + sql::Connection* CreateDB(const base::FilePath& db_name); // Encodes redirects into a string. static std::string GetRedirects(const MostVisitedURL& url); diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h index d6e17d4..875c6d8 100644 --- a/chrome/browser/icon_manager.h +++ b/chrome/browser/icon_manager.h @@ -51,7 +51,9 @@ #include "chrome/common/cancelable_task_tracker.h" #include "ui/gfx/image/image.h" +namespace base { class FilePath; +} class IconManager : public IconLoader::Delegate { public: @@ -63,7 +65,7 @@ class IconManager : public IconLoader::Delegate { // it via 'LoadIcon'. The returned bitmap is owned by the IconManager and must // not be free'd by the caller. If the caller needs to modify the icon, it // must make a copy and modify the copy. - gfx::Image* LookupIcon(const FilePath& file_name, IconLoader::IconSize size); + gfx::Image* LookupIcon(const base::FilePath& file_name, IconLoader::IconSize size); typedef base::Callback<void(gfx::Image*)> IconRequestCallback; @@ -77,7 +79,7 @@ class IconManager : public IconLoader::Delegate { // should never keep it or delete it. // 3. The gfx::Image pointer passed to the callback may be NULL if decoding // failed. - CancelableTaskTracker::TaskId LoadIcon(const FilePath& file_name, + CancelableTaskTracker::TaskId LoadIcon(const base::FilePath& file_name, IconLoader::IconSize size, const IconRequestCallback& callback, CancelableTaskTracker* tracker); @@ -87,7 +89,7 @@ class IconManager : public IconLoader::Delegate { // Get the identifying string for the given file. The implementation // is in icon_manager_[platform].cc. - static IconGroupID GetGroupIDFromFilepath(const FilePath& path); + static IconGroupID GetGroupIDFromFilepath(const base::FilePath& path); private: struct CacheKey { diff --git a/chrome/browser/icon_manager_android.cc b/chrome/browser/icon_manager_android.cc index 787d21c..393af5e 100644 --- a/chrome/browser/icon_manager_android.cc +++ b/chrome/browser/icon_manager_android.cc @@ -5,7 +5,7 @@ #include "base/logging.h" #include "chrome/browser/icon_manager.h" -IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { +IconGroupID IconManager::GetGroupIDFromFilepath(const base::FilePath& filepath) { NOTIMPLEMENTED(); return 0; } diff --git a/chrome/browser/icon_manager_linux.cc b/chrome/browser/icon_manager_linux.cc index df7c629..5dfa155 100644 --- a/chrome/browser/icon_manager_linux.cc +++ b/chrome/browser/icon_manager_linux.cc @@ -7,7 +7,8 @@ #include "base/nix/mime_util_xdg.h" #include "base/threading/thread_restrictions.h" -IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) { +IconGroupID IconManager::GetGroupIDFromFilepath( + const base::FilePath& filepath) { // It turns out the call to base::nix::GetFileMimeType below does IO, but // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows // and Mac implementations do not). We should fix this by either not doing IO diff --git a/chrome/browser/importer/firefox_importer_utils.h b/chrome/browser/importer/firefox_importer_utils.h index 1ba9bfe..f723ba4 100644 --- a/chrome/browser/importer/firefox_importer_utils.h +++ b/chrome/browser/importer/firefox_importer_utils.h @@ -12,12 +12,12 @@ #include "base/string16.h" #include "build/build_config.h" -class FilePath; class GURL; class TemplateURL; namespace base { class DictionaryValue; +class FilePath; } #if defined(OS_WIN) @@ -29,7 +29,7 @@ int GetCurrentFirefoxMajorVersionFromRegistry(); // Detects where Firefox lives. Returns an empty path if Firefox is not // installed. -FilePath GetFirefoxInstallPathFromRegistry(); +base::FilePath GetFirefoxInstallPathFromRegistry(); #endif // OS_WIN #if defined(OS_MACOSX) @@ -37,21 +37,21 @@ FilePath GetFirefoxInstallPathFromRegistry(); // in order to decoded FF profile passwords. // The Path is usuall FF App Bundle/Contents/Mac OS/ // Returns empty path on failure. -FilePath GetFirefoxDylibPath(); +base::FilePath GetFirefoxDylibPath(); #endif // OS_MACOSX // Returns the path to the Firefox profile. -FilePath GetFirefoxProfilePath(); +base::FilePath GetFirefoxProfilePath(); // Detects version of Firefox and installation path for the given Firefox // profile. -bool GetFirefoxVersionAndPathFromProfile(const FilePath& profile_path, +bool GetFirefoxVersionAndPathFromProfile(const base::FilePath& profile_path, int* version, - FilePath* app_path); + base::FilePath* app_path); // Gets the full path of the profiles.ini file. This file records the profiles // that can be used by Firefox. Returns an empty path if failed. -FilePath GetProfilesINI(); +base::FilePath GetProfilesINI(); // Parses the profile.ini file, and stores its information in |root|. // This file is a plain-text file. Key/value pairs are stored one per line, and @@ -65,7 +65,7 @@ FilePath GetProfilesINI(); // Path=Profiles/abcdefeg.default // We set "[value]" in path "<Section>.<Key>". For example, the path // "Genenral.StartWithLastProfile" has the value "1". -void ParseProfileINI(const FilePath& file, base::DictionaryValue* root); +void ParseProfileINI(const base::FilePath& file, base::DictionaryValue* root); // Returns true if we want to add the URL to the history. We filter out the URL // with a unsupported scheme. @@ -73,16 +73,16 @@ bool CanImportURL(const GURL& url); // Parses the OpenSearch XML files in |xml_files| and populates |search_engines| // with the resulting TemplateURLs. -void ParseSearchEnginesFromXMLFiles(const std::vector<FilePath>& xml_files, +void ParseSearchEnginesFromXMLFiles(const std::vector<base::FilePath>& xml_files, std::vector<TemplateURL*>* search_engines); // Returns the home page set in Firefox in a particular profile. -GURL GetHomepage(const FilePath& profile_path); +GURL GetHomepage(const base::FilePath& profile_path); // Checks to see if this home page is a default home page, as specified by // the resource file browserconfig.properties in the Firefox application // directory. -bool IsDefaultHomepage(const GURL& homepage, const FilePath& app_path); +bool IsDefaultHomepage(const GURL& homepage, const base::FilePath& app_path); // Parses the prefs found in the file |pref_file| and puts the key/value pairs // in |prefs|. Keys are strings, and values can be strings, booleans or @@ -90,7 +90,7 @@ bool IsDefaultHomepage(const GURL& homepage, const FilePath& app_path); // |prefs| is not filled). // Note: for strings, only valid UTF-8 string values are supported. If a // key/pair is not valid UTF-8, it is ignored and will not appear in |prefs|. -bool ParsePrefFile(const FilePath& pref_file, base::DictionaryValue* prefs); +bool ParsePrefFile(const base::FilePath& pref_file, base::DictionaryValue* prefs); // Parses the value of a particular firefox preference from a string that is the // contents of the prefs file. @@ -101,6 +101,6 @@ std::string GetPrefsJsValue(const std::string& prefs, // This is useful to differentiate between Firefox and Iceweasel. // If anything goes wrong while trying to obtain the branding name, // the function assumes it's Firefox. -string16 GetFirefoxImporterName(const FilePath& app_path); +string16 GetFirefoxImporterName(const base::FilePath& app_path); #endif // CHROME_BROWSER_IMPORTER_FIREFOX_IMPORTER_UTILS_H_ diff --git a/chrome/browser/importer/firefox_proxy_settings.h b/chrome/browser/importer/firefox_proxy_settings.h index 6f74494..41657a2 100644 --- a/chrome/browser/importer/firefox_proxy_settings.h +++ b/chrome/browser/importer/firefox_proxy_settings.h @@ -10,7 +10,9 @@ #include "base/basictypes.h" +namespace base { class FilePath; +} namespace net { class ProxyConfig; @@ -78,7 +80,7 @@ class FirefoxProxySettings { // Gets the settings from the passed prefs.js file and returns true if // successful. // Protected for tests. - static bool GetSettingsFromFile(const FilePath& pref_file, + static bool GetSettingsFromFile(const base::FilePath& pref_file, FirefoxProxySettings* settings); private: diff --git a/chrome/browser/importer/mork_reader.h b/chrome/browser/importer/mork_reader.h index d139477..05eed2c 100644 --- a/chrome/browser/importer/mork_reader.h +++ b/chrome/browser/importer/mork_reader.h @@ -49,9 +49,12 @@ #include "base/basictypes.h" -class FilePath; class ImporterBridge; +namespace base { +class FilePath; +} + // The nsMorkReader object allows a consumer to read in a mork-format // file and enumerate the rows that it contains. It does not provide // any functionality for modifying mork tables. @@ -90,7 +93,7 @@ class MorkReader { // Read in the given mork file. Returns true on success. // Note: currently, only single-table mork files are supported - bool Read(const FilePath& filename); + bool Read(const base::FilePath& filename); // Returns the list of columns in the current table. const MorkColumnList& columns() const { return columns_; } @@ -158,6 +161,6 @@ class MorkReader { }; // ImportHistoryFromFirefox2 is the main entry point to the importer. -void ImportHistoryFromFirefox2(const FilePath& file, ImporterBridge* bridge); +void ImportHistoryFromFirefox2(const base::FilePath& file, ImporterBridge* bridge); #endif // CHROME_BROWSER_IMPORTER_MORK_READER_H_ diff --git a/chrome/browser/importer/nss_decryptor.cc b/chrome/browser/importer/nss_decryptor.cc index 4439813..7a00b35 100644 --- a/chrome/browser/importer/nss_decryptor.cc +++ b/chrome/browser/importer/nss_decryptor.cc @@ -232,7 +232,7 @@ void NSSDecryptor::ParseSignons( } } -bool NSSDecryptor::ReadAndParseSignons(const FilePath& sqlite_file, +bool NSSDecryptor::ReadAndParseSignons(const base::FilePath& sqlite_file, std::vector<content::PasswordForm>* forms) { sql::Connection db; if (!db.Open(sqlite_file)) diff --git a/chrome/browser/importer/nss_decryptor_mac.h b/chrome/browser/importer/nss_decryptor_mac.h index 7cae82e..e8c7857 100644 --- a/chrome/browser/importer/nss_decryptor_mac.h +++ b/chrome/browser/importer/nss_decryptor_mac.h @@ -11,7 +11,9 @@ #include "base/basictypes.h" #include "base/string16.h" +namespace base { class FilePath; +} // The following declarations of functions and types are from Firefox // NSS library. @@ -120,7 +122,7 @@ class NSSDecryptor { ~NSSDecryptor(); // Initializes NSS if it hasn't already been initialized. - bool Init(const FilePath& dll_path, const FilePath& db_path); + bool Init(const base::FilePath& dll_path, const base::FilePath& db_path); // Decrypts Firefox stored passwords. Before using this method, // make sure Init() returns true. @@ -135,7 +137,7 @@ class NSSDecryptor { // Reads and parses the Firefox password sqlite db, decrypts the // username/password and reads other related information. // The result will be stored in |forms|. - bool ReadAndParseSignons(const FilePath& sqlite_file, + bool ReadAndParseSignons(const base::FilePath& sqlite_file, std::vector<content::PasswordForm>* forms); private: PK11SlotInfo* GetKeySlotForDB() const { return PK11_GetInternalKeySlot(); } diff --git a/chrome/browser/importer/nss_decryptor_null.h b/chrome/browser/importer/nss_decryptor_null.h index 4fd6934..5e690f4 100644 --- a/chrome/browser/importer/nss_decryptor_null.h +++ b/chrome/browser/importer/nss_decryptor_null.h @@ -11,7 +11,9 @@ #include "base/basictypes.h" #include "base/string16.h" +namespace base { class FilePath; +} namespace content { struct PasswordForm; @@ -22,11 +24,11 @@ struct PasswordForm; class NSSDecryptor { public: NSSDecryptor() {} - bool Init(const FilePath& dll_path, const FilePath& db_path) { return false; } + bool Init(const base::FilePath& dll_path, const base::FilePath& db_path) { return false; } string16 Decrypt(const std::string& crypt) const { return string16(); } void ParseSignons(const std::string& content, std::vector<content::PasswordForm>* forms) {} - bool ReadAndParseSignons(const FilePath& sqlite_file, + bool ReadAndParseSignons(const base::FilePath& sqlite_file, std::vector<content::PasswordForm>* forms) { return false; } diff --git a/chrome/browser/importer/nss_decryptor_system_nss.h b/chrome/browser/importer/nss_decryptor_system_nss.h index c125da9..41c4227 100644 --- a/chrome/browser/importer/nss_decryptor_system_nss.h +++ b/chrome/browser/importer/nss_decryptor_system_nss.h @@ -12,7 +12,9 @@ #include "base/basictypes.h" #include "base/string16.h" +namespace base { class FilePath; +} namespace content { struct PasswordForm; @@ -25,7 +27,7 @@ class NSSDecryptor { ~NSSDecryptor(); // Initializes NSS if it hasn't already been initialized. - bool Init(const FilePath& dll_path, const FilePath& db_path); + bool Init(const base::FilePath& dll_path, const base::FilePath& db_path); // Decrypts Firefox stored passwords. Before using this method, // make sure Init() returns true. @@ -40,7 +42,7 @@ class NSSDecryptor { // Reads and parses the Firefox password sqlite db, decrypts the // username/password and reads other related information. // The result will be stored in |forms|. - bool ReadAndParseSignons(const FilePath& sqlite_file, + bool ReadAndParseSignons(const base::FilePath& sqlite_file, std::vector<content::PasswordForm>* forms); private: // Does not actually free the slot, since we'll free it when NSSDecryptor is diff --git a/chrome/browser/importer/nss_decryptor_win.h b/chrome/browser/importer/nss_decryptor_win.h index 1aeb266..0a7b5ba 100644 --- a/chrome/browser/importer/nss_decryptor_win.h +++ b/chrome/browser/importer/nss_decryptor_win.h @@ -117,7 +117,7 @@ class NSSDecryptor { // Loads NSS3 library and returns true if successful. // |dll_path| indicates the location of NSS3 DLL files, and |db_path| // is the location of the database file that stores the keys. - bool Init(const FilePath& dll_path, const FilePath& db_path); + bool Init(const base::FilePath& dll_path, const base::FilePath& db_path); // Frees the libraries. void Free(); @@ -135,12 +135,12 @@ class NSSDecryptor { // Reads and parses the Firefox password sqlite db, decrypts the // username/password and reads other related information. // The result will be stored in |forms|. - bool ReadAndParseSignons(const FilePath& sqlite_file, + bool ReadAndParseSignons(const base::FilePath& sqlite_file, std::vector<content::PasswordForm>* forms); private: // Call NSS initialization funcs. - bool InitNSS(const FilePath& db_path, + bool InitNSS(const base::FilePath& db_path, base::NativeLibrary plds4_dll, base::NativeLibrary nspr4_dll); diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h index 401b541..d4865ab 100644 --- a/chrome/browser/jumplist_win.h +++ b/chrome/browser/jumplist_win.h @@ -21,10 +21,14 @@ #include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" +namespace base { +class FilePath; +} + namespace content { class NotificationRegistrar; } -class FilePath; + class Profile; class PageUsageData; @@ -222,7 +226,7 @@ class JumpList : public TabRestoreServiceObserver, std::wstring app_id_; // The directory which contains JumpList icons. - FilePath icon_dir_; + base::FilePath icon_dir_; // Items in the "Most Visited" category of the application JumpList, // protected by the list_lock_. diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.h b/chrome/browser/managed_mode/managed_mode_url_filter.h index 875b64f..2059cb4 100644 --- a/chrome/browser/managed_mode/managed_mode_url_filter.h +++ b/chrome/browser/managed_mode/managed_mode_url_filter.h @@ -19,7 +19,6 @@ namespace policy { class URLBlacklist; } // namespace policy -class FilePath; class GURL; // This class manages the filtering behavior for a given URL, i.e. it tells diff --git a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.h b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.h index bf98cbc..fff7110 100644 --- a/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.h +++ b/chrome/browser/media_gallery/linux/mtp_device_delegate_impl_linux.h @@ -15,9 +15,8 @@ #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/media/mtp_device_delegate.h" -class FilePath; - namespace base { +class FilePath; class SequencedTaskRunner; } @@ -52,14 +51,14 @@ class MTPDeviceDelegateImplLinux : public fileapi::MTPDeviceDelegate { // MTPDeviceDelegate: virtual base::PlatformFileError GetFileInfo( - const FilePath& file_path, + const base::FilePath& file_path, base::PlatformFileInfo* file_info) OVERRIDE; virtual scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator> - CreateFileEnumerator(const FilePath& root, + CreateFileEnumerator(const base::FilePath& root, bool recursive) OVERRIDE; virtual base::PlatformFileError CreateSnapshotFile( - const FilePath& device_file_path, - const FilePath& local_path, + const base::FilePath& device_file_path, + const base::FilePath& local_path, base::PlatformFileInfo* file_info) OVERRIDE; virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE; diff --git a/chrome/browser/media_gallery/media_file_system_context.h b/chrome/browser/media_gallery/media_file_system_context.h index 0925990..1714732 100644 --- a/chrome/browser/media_gallery/media_file_system_context.h +++ b/chrome/browser/media_gallery/media_file_system_context.h @@ -13,7 +13,9 @@ #include "chrome/browser/media_gallery/scoped_mtp_device_map_entry.h" #include "webkit/fileapi/media/mtp_device_file_system_config.h" +namespace base { class FilePath; +} namespace chrome { @@ -26,14 +28,14 @@ class MediaFileSystemContext { // Register a media file system (filtered to media files) for |path| and // return the new file system id. virtual std::string RegisterFileSystemForMassStorage( - const std::string& device_id, const FilePath& path) = 0; + const std::string& device_id, const base::FilePath& path) = 0; #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM) // Registers and returns the file system id for the MTP or PTP device // specified by |device_id| and |path|. Updates |entry| with the corresponding // ScopedMTPDeviceMapEntry object. virtual std::string RegisterFileSystemForMTPDevice( - const std::string& device_id, const FilePath& path, + const std::string& device_id, const base::FilePath& path, scoped_refptr<ScopedMTPDeviceMapEntry>* entry) = 0; #endif diff --git a/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.h b/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.h index db41cf0..d439edd 100644 --- a/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.h +++ b/chrome/browser/media_gallery/win/mtp_device_delegate_impl_win.h @@ -18,9 +18,8 @@ #include "webkit/fileapi/file_system_file_util.h" #include "webkit/fileapi/media/mtp_device_delegate.h" -class FilePath; - namespace base { +class FilePath; class SequencedTaskRunner; } @@ -56,14 +55,14 @@ class MTPDeviceDelegateImplWin : public fileapi::MTPDeviceDelegate { // MTPDeviceDelegate: virtual base::PlatformFileError GetFileInfo( - const FilePath& file_path, + const base::FilePath& file_path, base::PlatformFileInfo* file_info) OVERRIDE; virtual scoped_ptr<fileapi::FileSystemFileUtil::AbstractFileEnumerator> - CreateFileEnumerator(const FilePath& root, + CreateFileEnumerator(const base::FilePath& root, bool recursive) OVERRIDE; virtual base::PlatformFileError CreateSnapshotFile( - const FilePath& device_file_path, - const FilePath& local_path, + const base::FilePath& device_file_path, + const base::FilePath& local_path, base::PlatformFileInfo* file_info) OVERRIDE; virtual void CancelPendingTasksAndDeleteDelegate() OVERRIDE; diff --git a/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.h b/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.h index 7c7d991..8cf6a6b 100644 --- a/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.h +++ b/chrome/browser/media_gallery/win/recursive_mtp_device_object_enumerator.h @@ -18,7 +18,9 @@ #include "chrome/browser/media_gallery/win/mtp_device_object_entry.h" #include "webkit/fileapi/file_system_file_util.h" +namespace base { class FilePath; +} namespace chrome { @@ -40,7 +42,7 @@ class RecursiveMTPDeviceObjectEnumerator virtual ~RecursiveMTPDeviceObjectEnumerator(); // AbstractFileEnumerator: - virtual FilePath Next() OVERRIDE; + virtual base::FilePath Next() OVERRIDE; virtual int64 Size() OVERRIDE; virtual bool IsDirectory() OVERRIDE; virtual base::Time LastModifiedTime() OVERRIDE; diff --git a/chrome/browser/nacl_host/pnacl_file_host.h b/chrome/browser/nacl_host/pnacl_file_host.h index 7187561..f1a31bd 100644 --- a/chrome/browser/nacl_host/pnacl_file_host.h +++ b/chrome/browser/nacl_host/pnacl_file_host.h @@ -8,7 +8,10 @@ #include <string> class ChromeRenderMessageFilter; + +namespace base { class FilePath; +} namespace IPC { class Message; @@ -24,9 +27,9 @@ void GetReadonlyPnaclFd(ChromeRenderMessageFilter* chrome_render_message_filter, IPC::Message* reply_msg); // Return true if the filename requested is valid for opening. -// Sets file_to_open to the FilePath which we will attempt to open. +// Sets file_to_open to the base::FilePath which we will attempt to open. bool PnaclCanOpenFile(const std::string& filename, - FilePath* file_to_open); + base::FilePath* file_to_open); // Creates a temporary file that will be deleted when the last handle // is closed, or earlier. diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h index 90e7a75..85bfd0f 100644 --- a/chrome/browser/net/chrome_network_delegate.h +++ b/chrome/browser/net/chrome_network_delegate.h @@ -154,7 +154,7 @@ class ChromeNetworkDelegate : public net::NetworkDelegate { const std::string& cookie_line, net::CookieOptions* options) OVERRIDE; virtual bool OnCanAccessFile(const net::URLRequest& request, - const FilePath& path) const OVERRIDE; + const base::FilePath& path) const OVERRIDE; virtual bool OnCanThrottleRequest( const net::URLRequest& request) const OVERRIDE; virtual int OnBeforeSocketStreamConnect( diff --git a/chrome/browser/net/crl_set_fetcher.cc b/chrome/browser/net/crl_set_fetcher.cc index 6630285..9c869b3 100644 --- a/chrome/browser/net/crl_set_fetcher.cc +++ b/chrome/browser/net/crl_set_fetcher.cc @@ -22,7 +22,7 @@ using content::BrowserThread; CRLSetFetcher::CRLSetFetcher() : cus_(NULL) {} -bool CRLSetFetcher::GetCRLSetFilePath(FilePath* path) const { +bool CRLSetFetcher::GetCRLSetFilePath(base::FilePath* path) const { bool ok = PathService::Get(chrome::DIR_USER_DATA, path); if (!ok) { NOTREACHED(); @@ -47,7 +47,7 @@ void CRLSetFetcher::StartInitialLoad(ComponentUpdateService* cus) { void CRLSetFetcher::DoInitialLoadFromDisk() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); - FilePath crl_set_file_path; + base::FilePath crl_set_file_path; if (!GetCRLSetFilePath(&crl_set_file_path)) return; @@ -69,7 +69,7 @@ void CRLSetFetcher::DoInitialLoadFromDisk() { } } -void CRLSetFetcher::LoadFromDisk(FilePath path, +void CRLSetFetcher::LoadFromDisk(base::FilePath path, scoped_refptr<net::CRLSet>* out_crl_set) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); @@ -143,11 +143,12 @@ void CRLSetFetcher::OnUpdateError(int error) { } bool CRLSetFetcher::Install(base::DictionaryValue* manifest, - const FilePath& unpack_path) { + const base::FilePath& unpack_path) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); - FilePath crl_set_file_path = unpack_path.Append(FILE_PATH_LITERAL("crl-set")); - FilePath save_to; + base::FilePath crl_set_file_path = + unpack_path.Append(FILE_PATH_LITERAL("crl-set")); + base::FilePath save_to; if (!GetCRLSetFilePath(&save_to)) return true; diff --git a/chrome/browser/net/crl_set_fetcher.h b/chrome/browser/net/crl_set_fetcher.h index 86dd8ee..8bcca1f 100644 --- a/chrome/browser/net/crl_set_fetcher.h +++ b/chrome/browser/net/crl_set_fetcher.h @@ -11,10 +11,9 @@ #include "base/memory/ref_counted.h" #include "chrome/browser/component_updater/component_updater_service.h" -class FilePath; - namespace base { class DictionaryValue; +class FilePath; } namespace net { @@ -33,16 +32,16 @@ class CRLSetFetcher : public ComponentInstaller, // ComponentInstaller interface virtual void OnUpdateError(int error) OVERRIDE; virtual bool Install(base::DictionaryValue* manifest, - const FilePath& unpack_path) OVERRIDE; + const base::FilePath& unpack_path) OVERRIDE; private: friend class base::RefCountedThreadSafe<CRLSetFetcher>; virtual ~CRLSetFetcher(); - // GetCRLSetFilePath gets the path of the CRL set file in the user data + // GetCRLSetbase::FilePath gets the path of the CRL set file in the user data // dir. - bool GetCRLSetFilePath(FilePath* path) const; + bool GetCRLSetFilePath(base::FilePath* path) const; // DoInitialLoadFromDisk runs on the FILE thread and attempts to load a CRL // set from the user-data dir. It then registers this object as a component @@ -51,7 +50,7 @@ class CRLSetFetcher : public ComponentInstaller, // LoadFromDisk runs on the FILE thread and attempts to load a CRL set // from |load_from|. - void LoadFromDisk(FilePath load_from, + void LoadFromDisk(base::FilePath load_from, scoped_refptr<net::CRLSet>* out_crl_set); // SetCRLSetIfNewer runs on the IO thread and installs a CRL set diff --git a/chrome/browser/net/net_log_logger.h b/chrome/browser/net/net_log_logger.h index e8505b1..33e8217 100644 --- a/chrome/browser/net/net_log_logger.h +++ b/chrome/browser/net/net_log_logger.h @@ -8,7 +8,9 @@ #include "base/memory/scoped_handle.h" #include "net/base/net_log.h" +namespace base { class FilePath; +} // NetLogLogger watches the NetLog event stream, and sends all entries to // VLOG(1) or a path specified on creation. This is to debug errors that @@ -25,7 +27,7 @@ class NetLogLogger : public net::NetLog::ThreadSafeObserver { // If |log_path| is empty or file creation fails, writes to VLOG(1). // Otherwise, writes to |log_path|. Uses one line per entry, for // easy parsing. - explicit NetLogLogger(const FilePath &log_path); + explicit NetLogLogger(const base::FilePath &log_path); virtual ~NetLogLogger(); // Starts observing specified NetLog. Must not already be watching a NetLog. diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h index 72675da..bb6206d 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.h +++ b/chrome/browser/net/sqlite_persistent_cookie_store.h @@ -16,9 +16,12 @@ #include "net/cookies/cookie_monster.h" class ClearOnExitPolicy; -class FilePath; class Task; +namespace base { +class FilePath; +} + namespace net { class CanonicalCookie; } @@ -34,7 +37,7 @@ class SQLitePersistentCookieStore // If non-NULL, SQLitePersistentCookieStore will keep a scoped_refptr to the // |clear_on_exit_policy| throughout its lifetime. SQLitePersistentCookieStore( - const FilePath& path, + const base::FilePath& path, bool restore_old_session_cookies, ClearOnExitPolicy* clear_on_exit_policy); diff --git a/chrome/browser/net/sqlite_server_bound_cert_store.h b/chrome/browser/net/sqlite_server_bound_cert_store.h index 183923a..e20383f 100644 --- a/chrome/browser/net/sqlite_server_bound_cert_store.h +++ b/chrome/browser/net/sqlite_server_bound_cert_store.h @@ -11,7 +11,10 @@ #include "net/base/default_server_bound_cert_store.h" class ClearOnExitPolicy; + +namespace base { class FilePath; +} // Implements the net::DefaultServerBoundCertStore::PersistentStore interface // in terms of a SQLite database. For documentation about the actual member @@ -24,7 +27,7 @@ class SQLiteServerBoundCertStore public: // If non-NULL, SQLiteServerBoundCertStore will keep a scoped_refptr to the // |clear_on_exit_policy| throughout its lifetime. - SQLiteServerBoundCertStore(const FilePath& path, + SQLiteServerBoundCertStore(const base::FilePath& path, ClearOnExitPolicy* clear_on_exit_policy); // net::DefaultServerBoundCertStore::PersistentStore: diff --git a/chrome/browser/net/url_fixer_upper.h b/chrome/browser/net/url_fixer_upper.h index 72e07a9..0a137d8 100644 --- a/chrome/browser/net/url_fixer_upper.h +++ b/chrome/browser/net/url_fixer_upper.h @@ -10,12 +10,14 @@ #include "base/string16.h" #include "googleurl/src/gurl.h" -namespace url_parse { - struct Component; - struct Parsed; +namespace base { +class FilePath; } -class FilePath; +namespace url_parse { +struct Component; +struct Parsed; +} // This object is designed to convert various types of input into URLs that we // know are valid. For example, user typing in the URL bar or command line @@ -62,7 +64,7 @@ namespace URLFixerUpper { // For "regular" input, even if it is possibly a file with a full path, you // should use FixupURL() directly. This function should only be used when // relative path handling is desired, as for command line processing. - GURL FixupRelativeFile(const FilePath& base_dir, const FilePath& text); + GURL FixupRelativeFile(const base::FilePath& base_dir, const base::FilePath& text); // Offsets the beginning index of |part| by |offset|, which is allowed to be // negative. In some cases, the desired component does not exist at the given diff --git a/chrome/browser/parsers/metadata_parser.h b/chrome/browser/parsers/metadata_parser.h index 6700d14..8034a36 100644 --- a/chrome/browser/parsers/metadata_parser.h +++ b/chrome/browser/parsers/metadata_parser.h @@ -7,7 +7,9 @@ #include <string> +namespace base { class FilePath; +} // Allows for Iteration on the Properties of a given file. class MetadataPropertyIterator { @@ -30,7 +32,7 @@ class MetadataPropertyIterator { // Represents a single instance of parsing on a particular file. class MetadataParser { public: - explicit MetadataParser(const FilePath& path) {} + explicit MetadataParser(const base::FilePath& path) {} virtual ~MetadataParser() {} diff --git a/chrome/browser/parsers/metadata_parser_factory.h b/chrome/browser/parsers/metadata_parser_factory.h index d1d1279..c6c5a26 100644 --- a/chrome/browser/parsers/metadata_parser_factory.h +++ b/chrome/browser/parsers/metadata_parser_factory.h @@ -7,7 +7,9 @@ #include "chrome/browser/parsers/metadata_parser.h" +namespace base { class FilePath; +} // Used to check to see if a parser can parse a particular file, and allows // for creation of a parser on a particular file. @@ -18,13 +20,13 @@ class MetadataParserFactory { // Used to check to see if the parser can parse the given file. This // should not do any additional reading of the file. - virtual bool CanParse(const FilePath& path, + virtual bool CanParse(const base::FilePath& path, char* bytes, int bytes_size) = 0; // Creates the parser on the given file. Creating the parser does not // do any parsing on the file. Parse has to be called on the parser. - virtual MetadataParser* CreateParser(const FilePath& path) = 0; + virtual MetadataParser* CreateParser(const base::FilePath& path) = 0; }; #endif // CHROME_BROWSER_PARSERS_METADATA_PARSER_FACTORY_H_ diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.h b/chrome/browser/parsers/metadata_parser_jpeg_factory.h index 705f964d5..1c21144 100644 --- a/chrome/browser/parsers/metadata_parser_jpeg_factory.h +++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.h @@ -9,17 +9,19 @@ #include "base/compiler_specific.h" #include "chrome/browser/parsers/metadata_parser_factory.h" +namespace base { class FilePath; +} class MetadataParserJpegFactory : public MetadataParserFactory { public: MetadataParserJpegFactory(); // Implementation of MetadataParserFactory - virtual bool CanParse(const FilePath& path, + virtual bool CanParse(const base::FilePath& path, char* bytes, int bytes_size) OVERRIDE; - virtual MetadataParser* CreateParser(const FilePath& path) OVERRIDE; + virtual MetadataParser* CreateParser(const base::FilePath& path) OVERRIDE; private: DISALLOW_COPY_AND_ASSIGN(MetadataParserJpegFactory); diff --git a/chrome/browser/parsers/metadata_parser_manager.h b/chrome/browser/parsers/metadata_parser_manager.h index 910629f..2d5a759 100644 --- a/chrome/browser/parsers/metadata_parser_manager.h +++ b/chrome/browser/parsers/metadata_parser_manager.h @@ -9,9 +9,12 @@ #include "base/memory/scoped_vector.h" class MetadataParserFactory; -class FilePath; class MetadataParser; +namespace base { +class FilePath; +} + // Metadata Parser manager is used to find the correct parser for a // given file. Allows parsers to register themselves. class MetadataParserManager { @@ -28,7 +31,7 @@ class MetadataParserManager { bool RegisterParserFactory(MetadataParserFactory* parser); // Returns a new metadata parser for a given file. - MetadataParser* GetParserForFile(const FilePath& path); + MetadataParser* GetParserForFile(const base::FilePath& path); private: ScopedVector<MetadataParserFactory> factories_; diff --git a/chrome/browser/platform_util.h b/chrome/browser/platform_util.h index 44fde5d..629d756 100644 --- a/chrome/browser/platform_util.h +++ b/chrome/browser/platform_util.h @@ -10,18 +10,21 @@ #include "base/string16.h" #include "ui/gfx/native_widget_types.h" -class FilePath; class GURL; +namespace base { +class FilePath; +} + namespace platform_util { // Show the given file in a file manager. If possible, select the file. // Must be called from the UI thread. -void ShowItemInFolder(const FilePath& full_path); +void ShowItemInFolder(const base::FilePath& full_path); // Open the given file in the desktop's default manner. // Must be called from the UI thread. -void OpenItem(const FilePath& full_path); +void OpenItem(const base::FilePath& full_path); // Open the given external protocol URL in the desktop's default manner. // (For example, mailto: URLs in the default mail user agent.) diff --git a/chrome/browser/platform_util_android.cc b/chrome/browser/platform_util_android.cc index b938f5d..e29bea8 100644 --- a/chrome/browser/platform_util_android.cc +++ b/chrome/browser/platform_util_android.cc @@ -10,11 +10,11 @@ namespace platform_util { // TODO: crbug/115682 to track implementation of the following methods. -void ShowItemInFolder(const FilePath& full_path) { +void ShowItemInFolder(const base::FilePath& full_path) { NOTIMPLEMENTED(); } -void OpenItem(const FilePath& full_path) { +void OpenItem(const base::FilePath& full_path) { NOTIMPLEMENTED(); } diff --git a/chrome/browser/plugins/plugin_installer.h b/chrome/browser/plugins/plugin_installer.h index ac872dd..36b7eb3 100644 --- a/chrome/browser/plugins/plugin_installer.h +++ b/chrome/browser/plugins/plugin_installer.h @@ -13,7 +13,6 @@ #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" -class FilePath; class PluginInstallerObserver; class WeakPluginInstallerObserver; diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h index 84e5a63..7ba5053 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.h +++ b/chrome/browser/prefs/chrome_pref_service_factory.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_ namespace base { +class FilePath; class SequencedTaskRunner; } @@ -13,7 +14,6 @@ namespace policy { class PolicyService; } -class FilePath; class PrefServiceSimple; class PrefServiceSyncable; class PrefStore; @@ -35,14 +35,14 @@ namespace chrome_prefs { // function returned. PrefServiceSimple* CreateLocalState( - const FilePath& pref_filename, + const base::FilePath& pref_filename, base::SequencedTaskRunner* pref_io_task_runner, policy::PolicyService* policy_service, PrefStore* extension_prefs, bool async); PrefServiceSyncable* CreateProfilePrefs( - const FilePath& pref_filename, + const base::FilePath& pref_filename, base::SequencedTaskRunner* pref_io_task_runner, policy::PolicyService* policy_service, PrefStore* extension_prefs, diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h index ff57a72..0bc7f77 100644 --- a/chrome/browser/prefs/pref_service.h +++ b/chrome/browser/prefs/pref_service.h @@ -119,7 +119,7 @@ class PrefService : public PrefServiceBase, public base::NonThreadSafe { virtual int GetInteger(const char* path) const OVERRIDE; virtual double GetDouble(const char* path) const OVERRIDE; virtual std::string GetString(const char* path) const OVERRIDE; - virtual FilePath GetFilePath(const char* path) const OVERRIDE; + virtual base::FilePath GetFilePath(const char* path) const OVERRIDE; virtual const base::DictionaryValue* GetDictionary( const char* path) const OVERRIDE; virtual const base::ListValue* GetList(const char* path) const OVERRIDE; @@ -129,7 +129,8 @@ class PrefService : public PrefServiceBase, public base::NonThreadSafe { virtual void SetInteger(const char* path, int value) OVERRIDE; virtual void SetDouble(const char* path, double value) OVERRIDE; virtual void SetString(const char* path, const std::string& value) OVERRIDE; - virtual void SetFilePath(const char* path, const FilePath& value) OVERRIDE; + virtual void SetFilePath(const char* path, + const base::FilePath& value) OVERRIDE; virtual void SetInt64(const char* path, int64 value) OVERRIDE; virtual int64 GetInt64(const char* path) const OVERRIDE; virtual void SetUint64(const char* path, uint64 value) OVERRIDE; diff --git a/chrome/browser/prefs/pref_service_builder.h b/chrome/browser/prefs/pref_service_builder.h index adcbdf0..208e334 100644 --- a/chrome/browser/prefs/pref_service_builder.h +++ b/chrome/browser/prefs/pref_service_builder.h @@ -11,10 +11,10 @@ #include "base/prefs/persistent_pref_store.h" #include "base/prefs/pref_store.h" -class FilePath; class PrefServiceSimple; namespace base { +class FilePath; class SequencedTaskRunner; } @@ -40,7 +40,7 @@ class PrefServiceBuilder { // Specifies to use an actual file-backed user pref store. PrefServiceBuilder& WithUserFilePrefs( - const FilePath& prefs_file, + const base::FilePath& prefs_file, base::SequencedTaskRunner* task_runner); PrefServiceBuilder& WithAsync(bool async); diff --git a/chrome/browser/prefs/pref_service_simple.h b/chrome/browser/prefs/pref_service_simple.h index c37d7d0..fd1e612 100644 --- a/chrome/browser/prefs/pref_service_simple.h +++ b/chrome/browser/prefs/pref_service_simple.h @@ -26,7 +26,8 @@ class PrefServiceSimple : public PrefService { void RegisterIntegerPref(const char* path, int default_value); void RegisterDoublePref(const char* path, double default_value); void RegisterStringPref(const char* path, const std::string& default_value); - void RegisterFilePathPref(const char* path, const FilePath& default_value); + void RegisterFilePathPref(const char* path, + const base::FilePath& default_value); void RegisterListPref(const char* path); void RegisterDictionaryPref(const char* path); void RegisterListPref(const char* path, base::ListValue* default_value); diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h index c0da135..f280d7c 100644 --- a/chrome/browser/prefs/pref_service_syncable.h +++ b/chrome/browser/prefs/pref_service_syncable.h @@ -70,7 +70,7 @@ class PrefServiceSyncable : public PrefService { const std::string& default_value, PrefSyncStatus sync_status); void RegisterFilePathPref(const char* path, - const FilePath& default_value, + const base::FilePath& default_value, PrefSyncStatus sync_status); void RegisterListPref(const char* path, PrefSyncStatus sync_status); diff --git a/chrome/browser/printing/print_dialog_cloud.h b/chrome/browser/printing/print_dialog_cloud.h index 98cf1b5..7526646 100644 --- a/chrome/browser/printing/print_dialog_cloud.h +++ b/chrome/browser/printing/print_dialog_cloud.h @@ -13,9 +13,12 @@ #include "base/string16.h" #include "ui/gfx/native_widget_types.h" -class FilePath; class CommandLine; +namespace base { +class FilePath; +} + namespace content { class BrowserContext; } @@ -29,7 +32,7 @@ namespace print_dialog_cloud { // to. void CreatePrintDialogForFile(content::BrowserContext* browser_context, gfx::NativeWindow modal_parent, - const FilePath& path_to_file, + const base::FilePath& path_to_file, const string16& print_job_title, const string16& print_ticket, const std::string& file_type, diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index d8fdc92..5347526 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -14,13 +14,13 @@ #include "base/shared_memory.h" #endif -class FilePath; struct PrintHostMsg_ScriptedPrint_Params; class Profile; class ProfileIOData; namespace base { class DictionaryValue; +class FilePath; } namespace content { @@ -60,7 +60,7 @@ class PrintingMessageFilter : public content::BrowserMessageFilter { void OnAllocateTempFileForPrinting(base::FileDescriptor* temp_file_fd, int* sequence_number); void OnTempFileForPrintingWritten(int render_view_id, int sequence_number); - void CreatePrintDialogForFile(int render_view_id, const FilePath& path); + void CreatePrintDialogForFile(int render_view_id, const base::FilePath& path); #endif // Given a render_view_id get the corresponding WebContents. diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 02d1b09..40ca85d 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -143,7 +143,7 @@ class Profile : public content::BrowserContext { // Create a new profile given a path. If |create_mode| is // CREATE_MODE_ASYNCHRONOUS then the profile is initialized asynchronously. - static Profile* CreateProfile(const FilePath& path, + static Profile* CreateProfile(const base::FilePath& path, Delegate* delegate, CreateMode create_mode); @@ -227,7 +227,7 @@ class Profile : public content::BrowserContext { // Returns the request context used within |partition_id|. virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition( - const FilePath& partition_path, + const base::FilePath& partition_path, bool in_memory) = 0; // Returns the SSLConfigService for this profile. @@ -253,8 +253,8 @@ class Profile : public content::BrowserContext { virtual base::Time GetStartTime() const = 0; // Returns the last directory that was chosen for uploading or opening a file. - virtual FilePath last_selected_directory() = 0; - virtual void set_last_selected_directory(const FilePath& path) = 0; + virtual base::FilePath last_selected_directory() = 0; + virtual void set_last_selected_directory(const base::FilePath& path) = 0; #if defined(OS_CHROMEOS) enum AppLocaleChangedVia { diff --git a/chrome/browser/profiles/profile_info_cache_observer.h b/chrome/browser/profiles/profile_info_cache_observer.h index 853f8dd..746c1ed 100644 --- a/chrome/browser/profiles/profile_info_cache_observer.h +++ b/chrome/browser/profiles/profile_info_cache_observer.h @@ -8,7 +8,9 @@ #include "base/string16.h" #include "ui/gfx/image/image.h" +namespace base { class FilePath; +} // This class provides an Observer interface to watch for changes to the // ProfileInfoCache. @@ -16,13 +18,13 @@ class ProfileInfoCacheObserver { public: virtual ~ProfileInfoCacheObserver() {} - virtual void OnProfileAdded(const FilePath& profile_path) = 0; - virtual void OnProfileWillBeRemoved(const FilePath& profile_path) = 0; - virtual void OnProfileWasRemoved(const FilePath& profile_path, + virtual void OnProfileAdded(const base::FilePath& profile_path) = 0; + virtual void OnProfileWillBeRemoved(const base::FilePath& profile_path) = 0; + virtual void OnProfileWasRemoved(const base::FilePath& profile_path, const string16& profile_name) = 0; - virtual void OnProfileNameChanged(const FilePath& profile_path, + virtual void OnProfileNameChanged(const base::FilePath& profile_path, const string16& old_profile_name) = 0; - virtual void OnProfileAvatarChanged(const FilePath& profile_path) = 0; + virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) = 0; protected: ProfileInfoCacheObserver() {} diff --git a/chrome/browser/profiles/profile_info_cache_unittest.h b/chrome/browser/profiles/profile_info_cache_unittest.h index 640f4da..ec2ec70 100644 --- a/chrome/browser/profiles/profile_info_cache_unittest.h +++ b/chrome/browser/profiles/profile_info_cache_unittest.h @@ -13,9 +13,12 @@ #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" -class FilePath; class ProfileInfoCache; +namespace base { +class FilePath; +} + // Class used to test that ProfileInfoCache does not try to access any // unexpected profile names. class ProfileNameVerifierObserver : public ProfileInfoCacheObserver { @@ -25,16 +28,16 @@ class ProfileNameVerifierObserver : public ProfileInfoCacheObserver { virtual ~ProfileNameVerifierObserver(); // ProfileInfoCacheObserver overrides: - virtual void OnProfileAdded(const FilePath& profile_path) OVERRIDE; + virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; virtual void OnProfileWillBeRemoved( - const FilePath& profile_path) OVERRIDE; + const base::FilePath& profile_path) OVERRIDE; virtual void OnProfileWasRemoved( - const FilePath& profile_path, + const base::FilePath& profile_path, const string16& profile_name) OVERRIDE; virtual void OnProfileNameChanged( - const FilePath& profile_path, + const base::FilePath& profile_path, const string16& old_profile_name) OVERRIDE; - virtual void OnProfileAvatarChanged(const FilePath& profile_path) OVERRIDE; + virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) OVERRIDE; private: ProfileInfoCache* GetCache(); @@ -52,7 +55,7 @@ class ProfileInfoCacheTest : public testing::Test { virtual void TearDown() OVERRIDE; ProfileInfoCache* GetCache(); - FilePath GetProfilePath(const std::string& base_name); + base::FilePath GetProfilePath(const std::string& base_name); void ResetCache(); protected: diff --git a/chrome/browser/profiles/profile_metrics.h b/chrome/browser/profiles/profile_metrics.h index 2850a4f..c74a8ce 100644 --- a/chrome/browser/profiles/profile_metrics.h +++ b/chrome/browser/profiles/profile_metrics.h @@ -10,9 +10,12 @@ #include "base/basictypes.h" -class FilePath; class ProfileManager; +namespace base { +class FilePath; +} + class ProfileMetrics { public: // Enum for counting the ways users were added. @@ -80,9 +83,9 @@ class ProfileMetrics { // These functions should only be called on the UI thread because they hook // into g_browser_process through a helper function. - static void LogProfileLaunch(const FilePath& profile_path); - static void LogProfileSyncSignIn(const FilePath& profile_path); - static void LogProfileUpdate(const FilePath& profile_path); + static void LogProfileLaunch(const base::FilePath& profile_path); + static void LogProfileSyncSignIn(const base::FilePath& profile_path); + static void LogProfileUpdate(const base::FilePath& profile_path); }; diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.h index 3980f36..f3cf568 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.h +++ b/chrome/browser/renderer_host/pepper/pepper_flash_device_id_host.h @@ -11,7 +11,9 @@ #include "ppapi/host/resource_host.h" #include "ppapi/proxy/resource_message_params.h" +namespace base { class FilePath; +} namespace content { class BrowserPpapiHost; @@ -63,7 +65,7 @@ class PepperFlashDeviceIDHost : public ppapi::host::ResourceHost { // Called on the file thread to read the contents of the file and to // forward it to the IO thread. The path will be empty on error (in // which case it will forward the empty string to the IO thread). - void ReadDRMFileOnFileThread(const FilePath& path); + void ReadDRMFileOnFileThread(const base::FilePath& path); // Called on the IO thread to call back into the device ID host with the // file contents, or the empty string on failure. diff --git a/chrome/browser/safe_browsing/prefix_set.h b/chrome/browser/safe_browsing/prefix_set.h index 914dd5e..064c192 100644 --- a/chrome/browser/safe_browsing/prefix_set.h +++ b/chrome/browser/safe_browsing/prefix_set.h @@ -53,7 +53,9 @@ #include "chrome/browser/safe_browsing/safe_browsing_util.h" +namespace base { class FilePath; +} namespace safe_browsing { @@ -66,8 +68,8 @@ class PrefixSet { bool Exists(SBPrefix prefix) const; // Persist the set on disk. - static PrefixSet* LoadFile(const FilePath& filter_name); - bool WriteFile(const FilePath& filter_name) const; + static PrefixSet* LoadFile(const base::FilePath& filter_name); + bool WriteFile(const base::FilePath& filter_name) const; // Regenerate the vector of prefixes passed to the constructor into // |prefixes|. Prefixes will be added in sorted order. diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h index 731f319..d88fedb 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store.h +++ b/chrome/browser/safe_browsing/safe_browsing_store.h @@ -14,7 +14,9 @@ #include "base/time.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" +namespace base { class FilePath; +} // SafeBrowsingStore provides a storage abstraction for the // safe-browsing data used to build the bloom filter. The items @@ -163,7 +165,7 @@ class SafeBrowsingStore { // is detected, which could happen as part of any call other than // Delete(). The appropriate action is to use Delete() to clear the // store. - virtual void Init(const FilePath& filename, + virtual void Init(const base::FilePath& filename, const base::Closure& corruption_callback) = 0; // Deletes the files which back the store, returning true if diff --git a/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h b/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h index 20a0fc3..5854523 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h +++ b/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.h @@ -41,7 +41,7 @@ void SafeBrowsingStoreTestDeleteChunks(SafeBrowsingStore* store); // Test that deleting the store deletes the store. void SafeBrowsingStoreTestDelete(SafeBrowsingStore* store, - const FilePath& filename); + const base::FilePath& filename); // Wrap all the tests up for implementation subclasses. // |test_fixture| is the class that would be passed to TEST_F(), diff --git a/chrome/browser/safe_browsing/signature_util.h b/chrome/browser/safe_browsing/signature_util.h index 2233a55..00aef61 100644 --- a/chrome/browser/safe_browsing/signature_util.h +++ b/chrome/browser/safe_browsing/signature_util.h @@ -11,7 +11,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" +namespace base { class FilePath; +} namespace safe_browsing { class ClientDownloadRequest_SignatureInfo; @@ -23,7 +25,7 @@ class SignatureUtil : public base::RefCountedThreadSafe<SignatureUtil> { // Fills in the DownloadRequest_SignatureInfo for the given file path. // This method may be called on any thread. virtual void CheckSignature( - const FilePath& file_path, + const base::FilePath& file_path, ClientDownloadRequest_SignatureInfo* signature_info); protected: diff --git a/chrome/browser/safe_browsing/signature_util_posix.cc b/chrome/browser/safe_browsing/signature_util_posix.cc index b3c2b17..7a98a54 100644 --- a/chrome/browser/safe_browsing/signature_util_posix.cc +++ b/chrome/browser/safe_browsing/signature_util_posix.cc @@ -14,7 +14,7 @@ SignatureUtil::SignatureUtil() {} SignatureUtil::~SignatureUtil() {} void SignatureUtil::CheckSignature( - const FilePath& file_path, + const base::FilePath& file_path, ClientDownloadRequest_SignatureInfo* signature_info) {} } // namespace safe_browsing diff --git a/chrome/browser/sync_file_system/mock_remote_change_processor.h b/chrome/browser/sync_file_system/mock_remote_change_processor.h index ebf1969..a48cd36 100644 --- a/chrome/browser/sync_file_system/mock_remote_change_processor.h +++ b/chrome/browser/sync_file_system/mock_remote_change_processor.h @@ -11,7 +11,9 @@ #include "webkit/fileapi/syncable/file_change.h" #include "webkit/fileapi/syncable/sync_callbacks.h" +namespace base { class FilePath; +} namespace fileapi { class FileSystemURL; @@ -31,7 +33,7 @@ class MockRemoteChangeProcessor : public RemoteChangeProcessor { const PrepareChangeCallback& callback)); MOCK_METHOD4(ApplyRemoteChange, void(const fileapi::FileChange& change, - const FilePath& local_path, + const base::FilePath& local_path, const fileapi::FileSystemURL& url, const fileapi::SyncStatusCallback& callback)); MOCK_METHOD2(ClearLocalChanges, diff --git a/chrome/browser/sync_file_system/remote_change_processor.h b/chrome/browser/sync_file_system/remote_change_processor.h index e76a826..8fb00ad 100644 --- a/chrome/browser/sync_file_system/remote_change_processor.h +++ b/chrome/browser/sync_file_system/remote_change_processor.h @@ -10,7 +10,9 @@ #include "webkit/fileapi/syncable/sync_callbacks.h" #include "webkit/fileapi/syncable/sync_status_code.h" +namespace base { class FilePath; +} namespace fileapi { class FileChange; @@ -59,7 +61,7 @@ class RemoteChangeProcessor { // have disabled any further writing). virtual void ApplyRemoteChange( const fileapi::FileChange& change, - const FilePath& local_path, + const base::FilePath& local_path, const fileapi::FileSystemURL& url, const fileapi::SyncStatusCallback& callback) = 0; diff --git a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h index fd40f1f..45c9e67 100644 --- a/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h +++ b/chrome/browser/system_monitor/media_transfer_protocol_device_observer_linux.h @@ -12,7 +12,9 @@ #include "chrome/browser/system_monitor/removable_storage_notifications.h" #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" +namespace base { class FilePath; +} namespace chrome { @@ -37,7 +39,7 @@ class MediaTransferProtocolDeviceObserverLinux // Finds the storage that contains |path| and populates |storage_info|. // Returns false if unable to find the storage. bool GetStorageInfoForPath( - const FilePath& path, + const base::FilePath& path, RemovableStorageNotifications::StorageInfo* storage_info) const; protected: diff --git a/chrome/browser/system_monitor/portable_device_watcher_win.h b/chrome/browser/system_monitor/portable_device_watcher_win.h index 5f0e9d8..0d16ba6 100644 --- a/chrome/browser/system_monitor/portable_device_watcher_win.h +++ b/chrome/browser/system_monitor/portable_device_watcher_win.h @@ -20,8 +20,6 @@ namespace base { class SequencedTaskRunner; } -class FilePath; - namespace chrome { namespace test { diff --git a/chrome/browser/system_monitor/removable_device_notifications_linux.h b/chrome/browser/system_monitor/removable_device_notifications_linux.h index cd595c9..dea74249 100644 --- a/chrome/browser/system_monitor/removable_device_notifications_linux.h +++ b/chrome/browser/system_monitor/removable_device_notifications_linux.h @@ -25,11 +25,13 @@ #include "chrome/browser/system_monitor/removable_storage_notifications.h" #include "content/public/browser/browser_thread.h" +namespace base { class FilePath; +} // Gets device information given a |device_path|. On success, fills in // |unique_id|, |name|, |removable| and |partition_size_in_bytes|. -typedef void (*GetDeviceInfoFunc)(const FilePath& device_path, +typedef void (*GetDeviceInfoFunc)(const base::FilePath& device_path, std::string* unique_id, string16* name, bool* removable, @@ -43,7 +45,7 @@ class RemovableDeviceNotificationsLinux content::BrowserThread::DeleteOnFileThread> { public: // Should only be called by browser start up code. Use GetInstance() instead. - explicit RemovableDeviceNotificationsLinux(const FilePath& path); + explicit RemovableDeviceNotificationsLinux(const base::FilePath& path); // Must be called for RemovableDeviceNotificationsLinux to work. void Init(); @@ -51,7 +53,7 @@ class RemovableDeviceNotificationsLinux // Finds the device that contains |path| and populates |device_info|. // Returns false if unable to find the device. virtual bool GetDeviceInfoForPath( - const FilePath& path, + const base::FilePath& path, StorageInfo* device_info) const OVERRIDE; // Returns the storage partition size of the device present at |location|. @@ -60,7 +62,7 @@ class RemovableDeviceNotificationsLinux protected: // Only for use in unit tests. - RemovableDeviceNotificationsLinux(const FilePath& path, + RemovableDeviceNotificationsLinux(const base::FilePath& path, GetDeviceInfoFunc getDeviceInfo); // Avoids code deleting the object while there are references to it. @@ -69,7 +71,7 @@ class RemovableDeviceNotificationsLinux // error. virtual ~RemovableDeviceNotificationsLinux(); - virtual void OnFilePathChanged(const FilePath& path, bool error); + virtual void OnFilePathChanged(const base::FilePath& path, bool error); private: friend class base::RefCountedThreadSafe<RemovableDeviceNotificationsLinux>; @@ -82,24 +84,24 @@ class RemovableDeviceNotificationsLinux struct MountPointInfo { MountPointInfo(); - FilePath mount_device; + base::FilePath mount_device; std::string device_id; string16 device_name; uint64 partition_size_in_bytes; }; // Mapping of mount points to MountPointInfo. - typedef std::map<FilePath, MountPointInfo> MountMap; + typedef std::map<base::FilePath, MountPointInfo> MountMap; // (mount point, priority) // For devices that are mounted to multiple mount points, this helps us track // which one we've notified system monitor about. - typedef std::map<FilePath, bool> ReferencedMountPoint; + typedef std::map<base::FilePath, bool> ReferencedMountPoint; // (mount device, map of known mount points) // For each mount device, track the places it is mounted and which one (if // any) we have notified system monitor about. - typedef std::map<FilePath, ReferencedMountPoint> MountPriorityMap; + typedef std::map<base::FilePath, ReferencedMountPoint> MountPriorityMap; // Do initialization on the File Thread. void InitOnFileThread(); @@ -109,13 +111,13 @@ class RemovableDeviceNotificationsLinux // Adds |mount_device| as mounted on |mount_point|. If the device is a new // device any listeners are notified. - void AddNewMount(const FilePath& mount_device, const FilePath& mount_point); + void AddNewMount(const base::FilePath& mount_device, const base::FilePath& mount_point); // Whether Init() has been called or not. bool initialized_; // Mtab file that lists the mount points. - const FilePath mtab_path_; + const base::FilePath mtab_path_; // Watcher for |mtab_path_|. base::FilePathWatcher file_watcher_; diff --git a/chrome/browser/system_monitor/removable_device_notifications_window_win.h b/chrome/browser/system_monitor/removable_device_notifications_window_win.h index a2afd31..deb4bc5 100644 --- a/chrome/browser/system_monitor/removable_device_notifications_window_win.h +++ b/chrome/browser/system_monitor/removable_device_notifications_window_win.h @@ -10,7 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/system_monitor/removable_storage_notifications.h" +namespace base { class FilePath; +} namespace chrome { @@ -35,7 +37,7 @@ class RemovableDeviceNotificationsWindowWin // RemovableStorageNotifications: virtual bool GetDeviceInfoForPath( - const FilePath& path, + const base::FilePath& path, StorageInfo* device_info) const OVERRIDE; virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE; virtual bool GetMTPStorageInfoFromDeviceId( @@ -57,7 +59,7 @@ class RemovableDeviceNotificationsWindowWin // Gets the removable storage information given a |device_path|. On success, // returns true and fills in |device_location|, |unique_id|, |name| and // |removable|. - bool GetDeviceInfo(const FilePath& device_path, + bool GetDeviceInfo(const base::FilePath& device_path, string16* device_location, std::string* unique_id, string16* name, diff --git a/chrome/browser/system_monitor/test_volume_mount_watcher_win.h b/chrome/browser/system_monitor/test_volume_mount_watcher_win.h index 0771d70..a4b7227 100644 --- a/chrome/browser/system_monitor/test_volume_mount_watcher_win.h +++ b/chrome/browser/system_monitor/test_volume_mount_watcher_win.h @@ -15,7 +15,9 @@ #include "base/synchronization/waitable_event.h" #include "chrome/browser/system_monitor/volume_mount_watcher_win.h" +namespace base { class FilePath; +} namespace chrome { namespace test { @@ -25,7 +27,7 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin { TestVolumeMountWatcherWin(); virtual ~TestVolumeMountWatcherWin(); - void AddDeviceForTesting(const FilePath& device_path, + void AddDeviceForTesting(const base::FilePath& device_path, const std::string& device_id, const std::string& unique_id, const string16& device_name, @@ -35,30 +37,30 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin { void FlushWorkerPoolForTesting(); - virtual void DeviceCheckComplete(const FilePath& device_path); + virtual void DeviceCheckComplete(const base::FilePath& device_path); - std::vector<FilePath> devices_checked() const { return devices_checked_; } + std::vector<base::FilePath> devices_checked() const { return devices_checked_; } void BlockDeviceCheckForTesting(); void ReleaseDeviceCheck(); // VolumeMountWatcherWin: - virtual bool GetDeviceInfo(const FilePath& device_path, + virtual bool GetDeviceInfo(const base::FilePath& device_path, string16* device_location, std::string* unique_id, string16* name, bool* removable) const OVERRIDE; - virtual std::vector<FilePath> GetAttachedDevices(); + virtual std::vector<base::FilePath> GetAttachedDevices(); - bool GetRawDeviceInfo(const FilePath& device_path, + bool GetRawDeviceInfo(const base::FilePath& device_path, string16* device_location, std::string* unique_id, string16* name, bool* removable); private: - std::vector<FilePath> devices_checked_; + std::vector<base::FilePath> devices_checked_; scoped_ptr<base::WaitableEvent> device_check_complete_event_; DISALLOW_COPY_AND_ASSIGN(TestVolumeMountWatcherWin); diff --git a/chrome/browser/system_monitor/udev_util_linux.h b/chrome/browser/system_monitor/udev_util_linux.h index c138f4c..dffcb9f 100644 --- a/chrome/browser/system_monitor/udev_util_linux.h +++ b/chrome/browser/system_monitor/udev_util_linux.h @@ -11,7 +11,9 @@ #include "base/memory/scoped_generic_obj.h" +namespace base { class FilePath; +} namespace chrome { @@ -42,7 +44,7 @@ std::string GetUdevDevicePropertyValue(struct udev_device* udev_device, // Helper for udev_device_new_from_syspath()/udev_device_get_property_value() // pair. |device_path| is the absolute path to the device, including /sys. -bool GetUdevDevicePropertyValueByPath(const FilePath& device_path, +bool GetUdevDevicePropertyValueByPath(const base::FilePath& device_path, const char* key, std::string* result); diff --git a/chrome/browser/task_profiler/task_profiler_data_serializer.h b/chrome/browser/task_profiler/task_profiler_data_serializer.h index 6c2020e..9d58f3c 100644 --- a/chrome/browser/task_profiler/task_profiler_data_serializer.h +++ b/chrome/browser/task_profiler/task_profiler_data_serializer.h @@ -8,10 +8,9 @@ #include "base/basictypes.h" #include "content/public/common/process_type.h" -class FilePath; - namespace base { class DictionaryValue; +class FilePath; } namespace tracked_objects { @@ -31,7 +30,7 @@ class TaskProfilerDataSerializer { content::ProcessType process_type, base::DictionaryValue* dictionary); - bool WriteToFile(const FilePath& path); + bool WriteToFile(const base::FilePath& path); private: DISALLOW_COPY_AND_ASSIGN(TaskProfilerDataSerializer); diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index d15aeb5..6447566 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -18,10 +18,9 @@ #include "ui/base/layout.h" #include "ui/gfx/color_utils.h" -class FilePath; - namespace base { class DictionaryValue; +class FilePath; class RefCountedMemory; } @@ -67,14 +66,14 @@ class BrowserThemePack : public base::RefCountedThreadSafe< // operation should be relatively fast, as it should be an mmap() and some // pointer swizzling. Returns NULL on any error attempting to read |path|. static scoped_refptr<BrowserThemePack> BuildFromDataPack( - const FilePath& path, const std::string& expected_id); + const base::FilePath& path, const std::string& expected_id); // Builds a data pack on disk at |path| for future quick loading by // BuildFromDataPack(). Often (but not always) called from the file thread; // implementation should be threadsafe because neither thread will write to // |image_memory_| and the worker thread will keep a reference to prevent // destruction. - bool WriteToDisk(const FilePath& path) const; + bool WriteToDisk(const base::FilePath& path) const; // If this theme specifies data for the corresponding |id|, return true and // write the corresponding value to the output parameter. These functions @@ -112,8 +111,8 @@ class BrowserThemePack : public base::RefCountedThreadSafe< // The type passed to ui::DataPack::WritePack. typedef std::map<uint16, base::StringPiece> RawDataForWriting; - // An association between an id and the FilePath that has the image data. - typedef std::map<int, FilePath> FilePathMap; + // An association between an id and the base::FilePath that has the image data. + typedef std::map<int, base::FilePath> FilePathMap; // Default. Everything is empty. BrowserThemePack(); @@ -141,7 +140,7 @@ class BrowserThemePack : public base::RefCountedThreadSafe< // Parses the image names out of an extension. void ParseImageNamesFromJSON(base::DictionaryValue* images_value, - const FilePath& images_path, + const base::FilePath& images_path, FilePathMap* file_paths) const; // Creates the data for |source_images_| from |file_paths|. diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h index 89942ed..29b9778 100644 --- a/chrome/browser/themes/theme_service.h +++ b/chrome/browser/themes/theme_service.h @@ -20,9 +20,12 @@ class BrowserThemePack; class ThemeServiceTest; class ThemeSyncableService; -class FilePath; class Profile; +namespace base { +class FilePath; +} + namespace color_utils { struct HSL; } @@ -247,7 +250,7 @@ class ThemeService : public base::NonThreadSafe, virtual ThemeSyncableService* GetThemeSyncableService() const; // Save the images to be written to disk, mapping file path to id. - typedef std::map<FilePath, int> ImagesDiskCache; + typedef std::map<base::FilePath, int> ImagesDiskCache; protected: // Get the specified tint - |id| is one of the TINT_* enum values. @@ -277,7 +280,7 @@ class ThemeService : public base::NonThreadSafe, friend class ThemeServiceTest; // Saves the filename of the cached theme pack. - void SavePackName(const FilePath& pack_path); + void SavePackName(const base::FilePath& pack_path); // Save the id of the last theme installed. void SaveThemeID(const std::string& id); diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h index 8d4eefe..f65780b 100644 --- a/chrome/browser/ui/browser_command_controller.h +++ b/chrome/browser/ui/browser_command_controller.h @@ -102,13 +102,14 @@ class BrowserCommandController : public CommandUpdaterDelegate, const content::NotificationDetails& details) OVERRIDE; // Overridden from ProfileInfoCacheObserver: - virtual void OnProfileAdded(const FilePath& profile_path) OVERRIDE; - virtual void OnProfileWillBeRemoved(const FilePath& profile_path) OVERRIDE; - virtual void OnProfileWasRemoved(const FilePath& profile_path, + virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE; + virtual void OnProfileWillBeRemoved( + const base::FilePath& profile_path) OVERRIDE; + virtual void OnProfileWasRemoved(const base::FilePath& profile_path, const string16& profile_name) OVERRIDE; - virtual void OnProfileNameChanged(const FilePath& profile_path, + virtual void OnProfileNameChanged(const base::FilePath& profile_path, const string16& old_profile_name) OVERRIDE; - virtual void OnProfileAvatarChanged(const FilePath& profile_path) OVERRIDE; + virtual void OnProfileAvatarChanged(const base::FilePath& profile_path) OVERRIDE; // Overridden from ProfileSyncServiceObserver: virtual void OnStateChanged() OVERRIDE; diff --git a/chrome/browser/ui/cocoa/download/download_util_mac.h b/chrome/browser/ui/cocoa/download/download_util_mac.h index 968f1a1c..b873cc8 100644 --- a/chrome/browser/ui/cocoa/download/download_util_mac.h +++ b/chrome/browser/ui/cocoa/download/download_util_mac.h @@ -9,11 +9,13 @@ #import <Cocoa/Cocoa.h> +namespace base { class FilePath; +} namespace download_util { -void AddFileToPasteboard(NSPasteboard* pasteboard, const FilePath& path); +void AddFileToPasteboard(NSPasteboard* pasteboard, const base::FilePath& path); } // namespace download_util diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h index 0cf6b336..51feb42 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.h +++ b/chrome/browser/ui/hung_plugin_tab_helper.h @@ -17,9 +17,12 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" -class FilePath; class InfoBarDelegate; +namespace base { +class FilePath; +} + // Manages per-tab state with regard to hung plugins. This only handles // Pepper plugins which we know are windowless. Hung NPAPI plugins (which // may have native windows) can not be handled with infobars and have a @@ -40,10 +43,10 @@ class HungPluginTabHelper virtual ~HungPluginTabHelper(); // content::WebContentsObserver overrides: - virtual void PluginCrashed(const FilePath& plugin_path, + virtual void PluginCrashed(const base::FilePath& plugin_path, base::ProcessId plugin_pid) OVERRIDE; virtual void PluginHungStatusChanged(int plugin_child_id, - const FilePath& plugin_path, + const base::FilePath& plugin_path, bool is_hung) OVERRIDE; // NotificationObserver overrides. @@ -64,10 +67,10 @@ class HungPluginTabHelper // not we're currently showing the infobar. struct PluginState { // Initializes the plugin state to be a hung plugin. - PluginState(const FilePath& p, const string16& n); + PluginState(const base::FilePath& p, const string16& n); ~PluginState(); - FilePath path; + base::FilePath path; string16 name; // Possibly-null if we're not showing an infobar right now. diff --git a/chrome/browser/ui/network_profile_bubble.h b/chrome/browser/ui/network_profile_bubble.h index 7829539b..74eb2fa 100644 --- a/chrome/browser/ui/network_profile_bubble.h +++ b/chrome/browser/ui/network_profile_bubble.h @@ -8,10 +8,13 @@ #include "base/basictypes.h" class Browser; -class FilePath; class PrefServiceSyncable; class Profile; +namespace base { +class FilePath; +} + // This class will try to detect if the profile is on a network share and if // this is the case notify the user with an info bubble. class NetworkProfileBubble { @@ -47,7 +50,7 @@ class NetworkProfileBubble { // Verifies that the profile folder is not located on a network share, and if // it is shows the warning bubble to the user. - static void CheckNetworkProfile(const FilePath& profile_folder); + static void CheckNetworkProfile(const base::FilePath& profile_folder); // Shows the notification bubble using the provided |browser|. static void ShowNotification(Browser* browser); diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.h b/chrome/browser/ui/startup/startup_browser_creator_impl.h index 73806e3..4a0905c 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.h +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.h @@ -16,10 +16,13 @@ class Browser; class CommandLine; -class FilePath; class Profile; class StartupBrowserCreator; +namespace base { +class FilePath; +} + namespace content { class WebContents; } @@ -40,10 +43,10 @@ class StartupBrowserCreatorImpl { // and thus no access to distribution-specific first-run behaviors. The // second one is always called when the browser starts even if it is not // the first run. |is_first_run| indicates that this is a new profile. - StartupBrowserCreatorImpl(const FilePath& cur_dir, + StartupBrowserCreatorImpl(const base::FilePath& cur_dir, const CommandLine& command_line, chrome::startup::IsFirstRun is_first_run); - StartupBrowserCreatorImpl(const FilePath& cur_dir, + StartupBrowserCreatorImpl(const base::FilePath& cur_dir, const CommandLine& command_line, StartupBrowserCreator* browser_creator, chrome::startup::IsFirstRun is_first_run); @@ -148,7 +151,7 @@ class StartupBrowserCreatorImpl { Profile* profile, const std::vector<GURL>& startup_urls); - const FilePath cur_dir_; + const base::FilePath cur_dir_; const CommandLine& command_line_; Profile* profile_; StartupBrowserCreator* browser_creator_; diff --git a/chrome/browser/ui/user_data_dir_dialog.h b/chrome/browser/ui/user_data_dir_dialog.h index 7b25933..eb8418e 100644 --- a/chrome/browser/ui/user_data_dir_dialog.h +++ b/chrome/browser/ui/user_data_dir_dialog.h @@ -5,7 +5,9 @@ #ifndef CHROME_BROWSER_UI_USER_DATA_DIR_DIALOG_H_ #define CHROME_BROWSER_UI_USER_DATA_DIR_DIALOG_H_ +namespace base { class FilePath; +} namespace chrome { @@ -13,7 +15,7 @@ namespace chrome { // is showing. If the user picks a directory, this method returns the chosen // directory. |user_data_dir| is the value of the directory we were not able to // use. -FilePath ShowUserDataDirDialog(const FilePath& user_data_dir); +base::FilePath ShowUserDataDirDialog(const base::FilePath& user_data_dir); } // namespace chrome diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index 82acd58..4ba5a3d 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h @@ -28,11 +28,11 @@ #include "ui/shell_dialogs/select_file_dialog.h" class ExtensionService; -class FilePath; class PrefServiceSyncable; namespace base { class DictionaryValue; +class FilePath; class ListValue; } @@ -104,10 +104,10 @@ class ExtensionSettingsHandler virtual void RegisterMessages() OVERRIDE; // SelectFileDialog::Listener implementation. - virtual void FileSelected(const FilePath& path, + virtual void FileSelected(const base::FilePath& path, int index, void* params) OVERRIDE; virtual void MultiFilesSelected( - const std::vector<FilePath>& files, void* params) OVERRIDE; + const std::vector<base::FilePath>& files, void* params) OVERRIDE; virtual void FileSelectionCanceled(void* params) OVERRIDE {} // content::NotificationObserver implementation. @@ -218,7 +218,7 @@ class ExtensionSettingsHandler // Used to start the |load_extension_dialog_| in the last directory that was // loaded. - FilePath last_unpacked_directory_; + base::FilePath last_unpacked_directory_; // Used to show confirmation UI for uninstalling extensions in incognito mode. scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_; diff --git a/chrome/browser/ui/webui/feedback_ui.h b/chrome/browser/ui/webui/feedback_ui.h index 1aef958..4bef57d 100644 --- a/chrome/browser/ui/webui/feedback_ui.h +++ b/chrome/browser/ui/webui/feedback_ui.h @@ -10,7 +10,9 @@ #include "base/basictypes.h" #include "ui/web_dialogs/web_dialog_ui.h" +namespace base { class FilePath; +} class FeedbackUI : public ui::WebDialogUI { public: @@ -18,7 +20,7 @@ class FeedbackUI : public ui::WebDialogUI { #if defined(OS_CHROMEOS) static void GetMostRecentScreenshots( - const FilePath& filepath, + const base::FilePath& filepath, std::vector<std::string>* saved_screenshots, size_t max_saved); #endif diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h index 5be2f94..553ecff 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.h @@ -17,11 +17,11 @@ #include "printing/print_job_constants.h" #include "ui/shell_dialogs/select_file_dialog.h" -class FilePath; class PrintSystemTaskProxy; namespace base { class DictionaryValue; +class FilePath; class RefCountedBytes; } @@ -48,7 +48,7 @@ class PrintPreviewHandler : public content::WebUIMessageHandler, virtual void RegisterMessages() OVERRIDE; // SelectFileDialog::Listener implementation. - virtual void FileSelected(const FilePath& path, + virtual void FileSelected(const base::FilePath& path, int index, void* params) OVERRIDE; virtual void FileSelectionCanceled(void* params) OVERRIDE; @@ -57,7 +57,7 @@ class PrintPreviewHandler : public content::WebUIMessageHandler, virtual void OnPrintDialogShown() OVERRIDE; // Displays a modal dialog, prompting the user to select a file. - void SelectFile(const FilePath& default_path); + void SelectFile(const base::FilePath& default_path); // Called when the print preview dialog is destroyed. This is the last time // this object has access to the PrintViewManager in order to disconnect the @@ -220,7 +220,7 @@ class PrintPreviewHandler : public content::WebUIMessageHandler, // Holds the path to the print to pdf request. It is empty if no such request // exists. - scoped_ptr<FilePath> print_to_pdf_path_; + scoped_ptr<base::FilePath> print_to_pdf_path_; DISALLOW_COPY_AND_ASSIGN(PrintPreviewHandler); }; diff --git a/chrome/browser/ui/webui/print_preview/sticky_settings.h b/chrome/browser/ui/webui/print_preview/sticky_settings.h index ab3395d..77a4c10 100644 --- a/chrome/browser/ui/webui/print_preview/sticky_settings.h +++ b/chrome/browser/ui/webui/print_preview/sticky_settings.h @@ -11,13 +11,13 @@ #include "base/memory/scoped_ptr.h" -class FilePath; class PrintPreviewHandlerTest; class PrefService; class PrefServiceSyncable; namespace base { class DictionaryValue; +class FilePath; } namespace printing { @@ -30,20 +30,20 @@ class StickySettings { StickySettings(); ~StickySettings(); - FilePath* save_path(); + base::FilePath* save_path(); std::string* printer_app_state(); // Stores app state for the last used printer. void StoreAppState(const std::string& app_state); // Stores the last path the user used to save to pdf. - void StoreSavePath(const FilePath& path); + void StoreSavePath(const base::FilePath& path); void SaveInPrefs(PrefService* profile); void RestoreFromPrefs(PrefService* profile); static void RegisterUserPrefs(PrefServiceSyncable* prefs); private: - scoped_ptr<FilePath> save_path_; + scoped_ptr<base::FilePath> save_path_; scoped_ptr<std::string> printer_app_state_; }; diff --git a/chrome/browser/ui/webui/screenshot_source.h b/chrome/browser/ui/webui/screenshot_source.h index 4c7c0c5..30d80f4 100644 --- a/chrome/browser/ui/webui/screenshot_source.h +++ b/chrome/browser/ui/webui/screenshot_source.h @@ -23,9 +23,12 @@ typedef std::vector<unsigned char> ScreenshotData; typedef linked_ptr<ScreenshotData> ScreenshotDataPtr; -class FilePath; class Profile; +namespace base { +class FilePath; +} + // ScreenshotSource is the data source that serves screenshots (saved // or current) to the bug report html ui. class ScreenshotSource : public content::URLDataSource { @@ -40,7 +43,7 @@ class ScreenshotSource : public content::URLDataSource { // Common access for the screenshot directory, parameter is set to the // requested directory and return value of true is given upon success. - static bool GetScreenshotDirectory(FilePath* directory); + static bool GetScreenshotDirectory(base::FilePath* directory); #endif // Get the basefilename for screenshots @@ -89,14 +92,14 @@ class ScreenshotSource : public content::URLDataSource { void SendSavedScreenshot( const std::string& screenshot_path, const content::URLDataSource::GotDataCallback& callback, - const FilePath& file); + const base::FilePath& file); // The callback for Drive's getting file method. void GetSavedScreenshotCallback( const std::string& screenshot_path, const content::URLDataSource::GotDataCallback& callback, drive::DriveFileError error, - const FilePath& file, + const base::FilePath& file, const std::string& unused_mime_type, drive::DriveFileType file_type); diff --git a/chrome/browser/value_store/value_store_frontend.h b/chrome/browser/value_store/value_store_frontend.h index 19c0f23..0a4c0ba 100644 --- a/chrome/browser/value_store/value_store_frontend.h +++ b/chrome/browser/value_store/value_store_frontend.h @@ -14,9 +14,12 @@ #include "base/threading/non_thread_safe.h" #include "base/values.h" -class FilePath; class ValueStore; +namespace base { +class FilePath; +} + // A frontend for a LeveldbValueStore, for use on the UI thread. class ValueStoreFrontend : public base::SupportsWeakPtr<ValueStoreFrontend>, @@ -25,12 +28,12 @@ class ValueStoreFrontend typedef base::Callback<void(scoped_ptr<base::Value>)> ReadCallback; ValueStoreFrontend(); - explicit ValueStoreFrontend(const FilePath& db_path); + explicit ValueStoreFrontend(const base::FilePath& db_path); // This variant is useful for testing (using a mock ValueStore). explicit ValueStoreFrontend(ValueStore* value_store); ~ValueStoreFrontend(); - void Init(const FilePath& db_path); + void Init(const base::FilePath& db_path); // Retrieves a value from the database asynchronously, passing a copy to // |callback| when ready. NULL is passed if no matching entry is found. diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc index 48316da..a645d4d 100644 --- a/chrome/browser/webdata/web_database.cc +++ b/chrome/browser/webdata/web_database.cc @@ -89,7 +89,7 @@ sql::Connection* WebDatabase::GetSQLConnection() { return &db_; } -sql::InitStatus WebDatabase::Init(const FilePath& db_name, +sql::InitStatus WebDatabase::Init(const base::FilePath& db_name, const std::string& app_locale) { // When running in unit tests, there is already a NotificationService object. // Since only one can exist at a time per thread, check first. diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h index d384e65..273148e 100644 --- a/chrome/browser/webdata/web_database.h +++ b/chrome/browser/webdata/web_database.h @@ -11,13 +11,16 @@ #include "sql/meta_table.h" class AutofillTable; -class FilePath; class KeywordTable; class LoginsTable; class TokenServiceTable; class WebAppsTable; class WebIntentsTable; +namespace base { +class FilePath; +} + namespace content { class NotificationService; } @@ -35,7 +38,7 @@ class WebDatabase { // file is. If this returns an error code, no other method should be called. // Requires the |app_locale| to be passed as a parameter as the locale can // only safely be queried on the UI thread. - sql::InitStatus Init(const FilePath& db_name, const std::string& app_locale); + sql::InitStatus Init(const base::FilePath& db_name, const std::string& app_locale); // Transactions management void BeginTransaction(); |