Index: chrome/common/chrome_paths_internal.h |
diff --git a/chrome/common/chrome_paths_internal.h b/chrome/common/chrome_paths_internal.h |
index 1d91a6ff4a2f6fa10ee6883e395ed17389ba345a..5f9b18b9e13ae0f187543962562524a5b14d408f 100644 |
--- a/chrome/common/chrome_paths_internal.h |
+++ b/chrome/common/chrome_paths_internal.h |
@@ -17,18 +17,20 @@ class NSBundle; |
#endif |
#endif |
+namespace base { |
class FilePath; |
+} |
namespace chrome { |
// Get the path to the user's data directory, regardless of whether |
// DIR_USER_DATA has been overridden by a command-line option. |
-bool GetDefaultUserDataDirectory(FilePath* result); |
+bool GetDefaultUserDataDirectory(base::FilePath* result); |
// This returns the base directory in which Chrome Frame stores user profiles. |
// Note that this cannot be wrapped in a preprocessor define since |
// CF and Google Chrome want to share the same binaries. |
-bool GetChromeFrameUserDataDirectory(FilePath* result); |
+bool GetChromeFrameUserDataDirectory(base::FilePath* result); |
// Get the path to the user's cache directory. This is normally the |
// same as the profile directory, but on Linux it can also be |
@@ -37,54 +39,54 @@ bool GetChromeFrameUserDataDirectory(FilePath* result); |
// of this directory, with names like "Cache" and "Media Cache". |
// This will always fill in |result| with a directory, sometimes |
// just |profile_dir|. |
-void GetUserCacheDirectory(const FilePath& profile_dir, FilePath* result); |
+void GetUserCacheDirectory(const base::FilePath& profile_dir, base::FilePath* result); |
// Get the path to the user's documents directory. |
-bool GetUserDocumentsDirectory(FilePath* result); |
+bool GetUserDocumentsDirectory(base::FilePath* result); |
#if defined(OS_WIN) || defined(OS_LINUX) |
// Gets the path to a safe default download directory for a user. |
-bool GetUserDownloadsDirectorySafe(FilePath* result); |
+bool GetUserDownloadsDirectorySafe(base::FilePath* result); |
#endif |
// Get the path to the user's downloads directory. |
-bool GetUserDownloadsDirectory(FilePath* result); |
+bool GetUserDownloadsDirectory(base::FilePath* result); |
// Gets the path to the user's music directory. |
-bool GetUserMusicDirectory(FilePath* result); |
+bool GetUserMusicDirectory(base::FilePath* result); |
// Gets the path to the user's pictures directory. |
-bool GetUserPicturesDirectory(FilePath* result); |
+bool GetUserPicturesDirectory(base::FilePath* result); |
// Gets the path to the user's videos directory. |
-bool GetUserVideosDirectory(FilePath* result); |
+bool GetUserVideosDirectory(base::FilePath* result); |
#if defined(OS_MACOSX) && !defined(OS_IOS) |
// The "versioned directory" is a directory in the browser .app bundle. It |
// contains the bulk of the application, except for the things that the system |
// requires be located at spepcific locations. The versioned directory is |
// in the .app at Contents/Versions/w.x.y.z. |
-FilePath GetVersionedDirectory(); |
+base::FilePath GetVersionedDirectory(); |
// This overrides the directory returned by |GetVersionedDirectory()|, to be |
// used when |GetVersionedDirectory()| can't automatically determine the proper |
// location. This is the case when the browser didn't load itself but by, e.g., |
// the app mode loader. This should be called before |ChromeMain()|. This takes |
// ownership of the object |path| and the caller must not delete it. |
-void SetOverrideVersionedDirectory(const FilePath* path); |
+void SetOverrideVersionedDirectory(const base::FilePath* path); |
// Most of the application is further contained within the framework. The |
// framework bundle is located within the versioned directory at a specific |
// path. The only components in the versioned directory not included in the |
// framework are things that also depend on the framework, such as the helper |
// app bundle. |
-FilePath GetFrameworkBundlePath(); |
+base::FilePath GetFrameworkBundlePath(); |
// Get the local library directory. |
-bool GetLocalLibraryDirectory(FilePath* result); |
+bool GetLocalLibraryDirectory(base::FilePath* result); |
// Get the global Application Support directory (under /Library/). |
-bool GetGlobalApplicationSupportDirectory(FilePath* result); |
+bool GetGlobalApplicationSupportDirectory(base::FilePath* result); |
// Returns the NSBundle for the outer browser application, even when running |
// inside the helper. In unbundled applications, such as tests, returns nil. |