| OLD | NEW |
| 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 "chrome/common/chrome_paths_internal.h" | 5 #include "chrome/common/chrome_paths_internal.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 #include <string.h> | 8 #include <string.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "base/base_paths.h" | 12 #include "base/base_paths.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #import "base/mac/foundation_util.h" | 14 #import "base/mac/foundation_util.h" |
| 15 #import "base/mac/scoped_nsautorelease_pool.h" | 15 #import "base/mac/scoped_nsautorelease_pool.h" |
| 16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
| 17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "chrome/common/chrome_constants.h" | 18 #include "chrome/common/chrome_constants.h" |
| 19 | 19 |
| 20 #if !defined(OS_IOS) | |
| 21 #import "base/mac/mac_util.h" | |
| 22 #endif | |
| 23 | |
| 24 namespace { | 20 namespace { |
| 25 | 21 |
| 26 #if !defined(OS_IOS) | 22 #if !defined(OS_IOS) |
| 27 const base::FilePath* g_override_versioned_directory = NULL; | 23 const base::FilePath* g_override_versioned_directory = NULL; |
| 28 | 24 |
| 29 // Return a retained (NOT autoreleased) NSBundle* as the internal | 25 // Return a retained (NOT autoreleased) NSBundle* as the internal |
| 30 // implementation of chrome::OuterAppBundle(), which should be the only | 26 // implementation of chrome::OuterAppBundle(), which should be the only |
| 31 // caller. | 27 // caller. |
| 32 NSBundle* OuterAppBundleInternal() { | 28 NSBundle* OuterAppBundleInternal() { |
| 33 base::mac::ScopedNSAutoreleasePool pool; | 29 base::mac::ScopedNSAutoreleasePool pool; |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 | 243 |
| 248 #endif // !defined(OS_IOS) | 244 #endif // !defined(OS_IOS) |
| 249 | 245 |
| 250 bool ProcessNeedsProfileDir(const std::string& process_type) { | 246 bool ProcessNeedsProfileDir(const std::string& process_type) { |
| 251 // For now we have no reason to forbid this on other MacOS as we don't | 247 // For now we have no reason to forbid this on other MacOS as we don't |
| 252 // have the roaming profile troubles there. | 248 // have the roaming profile troubles there. |
| 253 return true; | 249 return true; |
| 254 } | 250 } |
| 255 | 251 |
| 256 } // namespace chrome | 252 } // namespace chrome |
| OLD | NEW |