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

Side by Side Diff: content/shell/paths_mac.mm

Issue 12286020: Replace FilePath with base::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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/paths_mac.h" 5 #include "content/shell/paths_mac.h"
6 6
7 #include "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
8 #include "base/mac/foundation_util.h" 8 #include "base/mac/foundation_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 .Append("Content Shell Helper"); 49 .Append("Content Shell Helper");
50 50
51 PathService::Override(content::CHILD_PROCESS_EXE, helper_path); 51 PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
52 } 52 }
53 53
54 base::FilePath GetResourcesPakFilePath() { 54 base::FilePath GetResourcesPakFilePath() {
55 NSString* pak_path = 55 NSString* pak_path =
56 [base::mac::FrameworkBundle() pathForResource:@"content_shell" 56 [base::mac::FrameworkBundle() pathForResource:@"content_shell"
57 ofType:@"pak"]; 57 ofType:@"pak"];
58 58
59 return FilePath([pak_path fileSystemRepresentation]); 59 return base::FilePath([pak_path fileSystemRepresentation]);
60 } 60 }
OLDNEW
« no previous file with comments | « content/shell/android/browsertests_apk/content_browser_tests_android.cc ('k') | content/shell/shell_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698