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

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

Issue 9835062: Mac content shell: Set up resources properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « content/shell/paths_mac.h ('k') | content/shell/shell_main_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/file_path.h"
8 #include "base/mac/bundle_locations.h" 7 #include "base/mac/bundle_locations.h"
9 #include "base/mac/foundation_util.h" 8 #include "base/mac/foundation_util.h"
10 #include "base/path_service.h" 9 #include "base/path_service.h"
11 #include "content/public/common/content_paths.h" 10 #include "content/public/common/content_paths.h"
12 11
13 namespace { 12 namespace {
14 13
15 FilePath GetFrameworksPath() { 14 FilePath GetFrameworksPath() {
16 // Start out with the path to the running executable. 15 // Start out with the path to the running executable.
17 FilePath path; 16 FilePath path;
(...skipping 25 matching lines...) Expand all
43 } 42 }
44 43
45 void OverrideChildProcessPath() { 44 void OverrideChildProcessPath() {
46 FilePath helper_path = GetFrameworksPath().Append("Content Shell Helper.app") 45 FilePath helper_path = GetFrameworksPath().Append("Content Shell Helper.app")
47 .Append("Contents") 46 .Append("Contents")
48 .Append("MacOS") 47 .Append("MacOS")
49 .Append("Content Shell Helper"); 48 .Append("Content Shell Helper");
50 49
51 PathService::Override(content::CHILD_PROCESS_EXE, helper_path); 50 PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
52 } 51 }
52
53 FilePath GetResourcesPakFilePath() {
54 NSString* pak_path =
55 [base::mac::FrameworkBundle() pathForResource:@"content_shell"
56 ofType:@"pak"];
57
58 return FilePath([pak_path fileSystemRepresentation]);
59 }
OLDNEW
« no previous file with comments | « content/shell/paths_mac.h ('k') | content/shell/shell_main_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698