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

Unified Diff: content/shell/webkit_test_platform_support_mac.mm

Issue 12470006: mac content shell drt: Don't DLOG(FATAL) during font loading in debug builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: space Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/shell_main_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/webkit_test_platform_support_mac.mm
diff --git a/content/shell/webkit_test_platform_support_mac.mm b/content/shell/webkit_test_platform_support_mac.mm
index 83db7e5b39af74651ac0a2770537fe0abb1499c2..6b280c0925eeb7f8611348246b20d38ca98feb1c 100644
--- a/content/shell/webkit_test_platform_support_mac.mm
+++ b/content/shell/webkit_test_platform_support_mac.mm
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/logging.h"
+#include "base/mac/bundle_locations.h"
#include "content/shell/webkit_test_platform_support.h"
#include <AppKit/AppKit.h>
@@ -59,7 +60,7 @@ bool WebKitTestPlatformInitialize() {
// its direct dependents, it's not easily possible to put the ttf files into
// the helper's resource directory instead of the outer bundle's resource
// directory.
- NSString* bundle = [[NSBundle mainBundle] bundlePath];
+ NSString* bundle = [base::mac::FrameworkBundle() bundlePath];
bundle = [bundle stringByAppendingPathComponent:@"../.."];
NSURL* resources_directory = [[NSBundle bundleWithPath:bundle] resourceURL];
« no previous file with comments | « content/shell/shell_main_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698