summaryrefslogtreecommitdiffstats
path: root/base/file_version_info_mac.mm
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-17 19:36:03 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-17 19:36:03 +0000
commitaaa6df4d3d1931eec2235902f791f4e414cd09e8 (patch)
tree9552421ac5000a541b897508e4e73fd33325a587 /base/file_version_info_mac.mm
parent6beee703776760481ae8fd9784e571ea324d464d (diff)
downloadchromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.zip
chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.tar.gz
chromium_src-aaa6df4d3d1931eec2235902f791f4e414cd09e8.tar.bz2
Disable "using base::FilePath" on Linux since it now compiles.
This keeps the using for other platforms temporarily. This patch is to "stop the bleeding" since new conflicts are added every day. The other platforms will be fixed in followup patches. This also adds an exception for the MTPD code which has a circular dependency on FilePath. Review URL: https://codereview.chromium.org/12282019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_version_info_mac.mm')
-rw-r--r--base/file_version_info_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm
index c989443..54af633 100644
--- a/base/file_version_info_mac.mm
+++ b/base/file_version_info_mac.mm
@@ -25,7 +25,7 @@ FileVersionInfo* FileVersionInfo::CreateFileVersionInfoForCurrentModule() {
// static
FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
- const FilePath& file_path) {
+ const base::FilePath& file_path) {
NSString* path = base::SysUTF8ToNSString(file_path.value());
NSBundle* bundle = [NSBundle bundleWithPath:path];
return new FileVersionInfoMac(bundle);