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

Unified Diff: ui/base/resource/resource_bundle_ios.mm

Issue 12217101: Replace FilePath with base::FilePath in some more top level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_ios.mm
diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm
index 7140d69ab20e1ffdbed5a4441a6491e04b38f961..07171613cd53dc04893e91c908b416249ca25056 100644
--- a/ui/base/resource/resource_bundle_ios.mm
+++ b/ui/base/resource/resource_bundle_ios.mm
@@ -36,9 +36,9 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
}
if (!resource_path) {
// Return just the name of the pak file.
- return FilePath(base::SysNSStringToUTF8(name) + ".pak");
+ return base::FilePath(base::SysNSStringToUTF8(name) + ".pak");
}
- return FilePath([resource_path fileSystemRepresentation]);
+ return base::FilePath([resource_path fileSystemRepresentation]);
}
} // namespace
@@ -70,7 +70,8 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
if ([mac_locale isEqual:@"en_US"])
mac_locale = @"en";
- FilePath locale_file_path = GetResourcesPakFilePath(@"locale", mac_locale);
+ base::FilePath locale_file_path =
+ GetResourcesPakFilePath(@"locale", mac_locale);
if (delegate_) {
locale_file_path =
@@ -79,10 +80,10 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
// Don't try to load empty values or values that are not absolute paths.
if (locale_file_path.empty() || !locale_file_path.IsAbsolute())
- return FilePath();
+ return base::FilePath();
if (test_file_exists && !file_util::PathExists(locale_file_path))
- return FilePath();
+ return base::FilePath();
return locale_file_path;
}
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698