summaryrefslogtreecommitdiffstats
path: root/chrome_frame/utils.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 05:12:33 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 05:12:33 +0000
commita3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch)
treebdd4dac76e6034ef6cf33450e203269a715ea0e6 /chrome_frame/utils.h
parent8bc574c57115e9ffd0169f33131c0865997dcb35 (diff)
downloadchromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip
chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz
chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes. Review URL: https://codereview.chromium.org/12163003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.h')
-rw-r--r--chrome_frame/utils.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 2204571..29084db 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -20,12 +20,15 @@
#include "googleurl/src/gurl.h"
#include "ui/gfx/rect.h"
-class FilePath;
class RegistryListPreferencesHolder;
interface IBrowserService;
interface IWebBrowser2;
struct ContextMenuModel;
+namespace base {
+class FilePath;
+}
+
// utils.h : Various utility functions and classes
extern const char kGCFProtocol[];
@@ -207,7 +210,7 @@ IEVersion GetIEVersion();
// hosted. Returns 0 if the current process is not IE or any other error occurs.
uint32 GetIEMajorVersion();
-FilePath GetIETemporaryFilesFolder();
+base::FilePath GetIETemporaryFilesFolder();
// Retrieves the file version from a module handle without extra round trips
// to the disk (as happens with the regular GetFileVersionInfo API).
@@ -601,6 +604,6 @@ bool IncreaseWinInetConnections(DWORD connections);
// Sets |profile_path| to the path for the Chrome Frame |profile_name|
// profile.
void GetChromeFrameProfilePath(const string16& profile_name,
- FilePath* profile_path);
+ base::FilePath* profile_path);
#endif // CHROME_FRAME_UTILS_H_