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

Side by Side Diff: base/mac/bundle_locations.mm

Issue 12213061: Move sys_string_conversions to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm him 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
« no previous file with comments | « base/ios/device_util_unittest.mm ('k') | base/mac/foundation_util.mm » ('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 "base/mac/bundle_locations.h" 5 #include "base/mac/bundle_locations.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/foundation_util.h" 8 #include "base/mac/foundation_util.h"
9 #include "base/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 10
11 namespace base { 11 namespace base {
12 namespace mac { 12 namespace mac {
13 13
14 // NSBundle isn't threadsafe, all functions in this file must be called on the 14 // NSBundle isn't threadsafe, all functions in this file must be called on the
15 // main thread. 15 // main thread.
16 static NSBundle* g_override_framework_bundle = nil; 16 static NSBundle* g_override_framework_bundle = nil;
17 static NSBundle* g_override_outer_bundle = nil; 17 static NSBundle* g_override_outer_bundle = nil;
18 18
19 NSBundle* MainBundle() { 19 NSBundle* MainBundle() {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 void SetOverrideOuterBundlePath(const FilePath& file_path) { 74 void SetOverrideOuterBundlePath(const FilePath& file_path) {
75 AssignOverridePath(file_path, &g_override_outer_bundle); 75 AssignOverridePath(file_path, &g_override_outer_bundle);
76 } 76 }
77 77
78 void SetOverrideFrameworkBundlePath(const FilePath& file_path) { 78 void SetOverrideFrameworkBundlePath(const FilePath& file_path) {
79 AssignOverridePath(file_path, &g_override_framework_bundle); 79 AssignOverridePath(file_path, &g_override_framework_bundle);
80 } 80 }
81 81
82 } // namespace mac 82 } // namespace mac
83 } // namespace base 83 } // namespace base
OLDNEW
« no previous file with comments | « base/ios/device_util_unittest.mm ('k') | base/mac/foundation_util.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698