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

Unified Diff: app/resource_bundle_mac.mm

Issue 6046009: Move base/mac_util.h to base/mac and use the base::mac namespace.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 12 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 | « app/mac/nsimage_cache.mm ('k') | app/test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resource_bundle_mac.mm
===================================================================
--- app/resource_bundle_mac.mm (revision 70358)
+++ app/resource_bundle_mac.mm (working copy)
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/file_path.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/sys_string_conversions.h"
#include "skia/ext/skia_utils_mac.h"
@@ -21,12 +21,12 @@
// as the already-running browser instead of using what NSBundle might pick
// based on values at helper launch time.
if ([mac_locale length]) {
- resource_path = [mac_util::MainAppBundle() pathForResource:name
+ resource_path = [base::mac::MainAppBundle() pathForResource:name
ofType:@"pak"
inDirectory:@""
forLocalization:mac_locale];
} else {
- resource_path = [mac_util::MainAppBundle() pathForResource:name
+ resource_path = [base::mac::MainAppBundle() pathForResource:name
ofType:@"pak"];
}
if (!resource_path)
« no previous file with comments | « app/mac/nsimage_cache.mm ('k') | app/test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698