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

Unified Diff: content/shell/paths_mac.mm

Issue 12208057: Add explicit base to FilePath. (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 | « content/shell/paths_mac.h ('k') | content/shell/shell_browser_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/paths_mac.mm
diff --git a/content/shell/paths_mac.mm b/content/shell/paths_mac.mm
index 27162b1e343f3ddbb971d8db6cba54aa42090d6e..120ca3424632b3ae1584f6b725e7dd89acb7d458 100644
--- a/content/shell/paths_mac.mm
+++ b/content/shell/paths_mac.mm
@@ -11,9 +11,9 @@
namespace {
-FilePath GetFrameworksPath() {
+base::FilePath GetFrameworksPath() {
// Start out with the path to the running executable.
- FilePath path;
+ base::FilePath path;
PathService::Get(base::FILE_EXE, &path);
// Up to Contents.
@@ -35,14 +35,15 @@ FilePath GetFrameworksPath() {
} // namespace
void OverrideFrameworkBundlePath() {
- FilePath helper_path =
+ base::FilePath helper_path =
GetFrameworksPath().Append("Content Shell Framework.framework");
base::mac::SetOverrideFrameworkBundlePath(helper_path);
}
void OverrideChildProcessPath() {
- FilePath helper_path = GetFrameworksPath().Append("Content Shell Helper.app")
+ base::FilePath helper_path =
+ GetFrameworksPath().Append("Content Shell Helper.app")
.Append("Contents")
.Append("MacOS")
.Append("Content Shell Helper");
@@ -50,7 +51,7 @@ void OverrideChildProcessPath() {
PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
}
-FilePath GetResourcesPakFilePath() {
+base::FilePath GetResourcesPakFilePath() {
NSString* pak_path =
[base::mac::FrameworkBundle() pathForResource:@"content_shell"
ofType:@"pak"];
« no previous file with comments | « content/shell/paths_mac.h ('k') | content/shell/shell_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698