From ecc14dd0230477e137070143436d9d2a258ca4c2 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 14 Apr 2015 14:15:53 +0800 Subject: [PATCH] mac: Avoid making frameworks_path for twice --- atom/browser/atom_browser_main_parts_mac.mm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/atom/browser/atom_browser_main_parts_mac.mm b/atom/browser/atom_browser_main_parts_mac.mm index fe72beb5b9d7..1de07dfc0e44 100644 --- a/atom/browser/atom_browser_main_parts_mac.mm +++ b/atom/browser/atom_browser_main_parts_mac.mm @@ -4,12 +4,11 @@ #include "atom/browser/atom_browser_main_parts.h" -#import "atom/browser/mac/atom_application.h" -#import "atom/browser/mac/atom_application_delegate.h" -#include "base/files/file_path.h" -#import "base/mac/foundation_util.h" +#include "atom/browser/mac/atom_application.h" +#include "atom/browser/mac/atom_application_delegate.h" +#include "base/mac/bundle_locations.h" +#include "base/mac/foundation_util.h" #include "ui/base/l10n/l10n_util_mac.h" -#import "vendor/brightray/common/mac/main_application_bundle.h" namespace atom { @@ -23,12 +22,7 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() { AtomApplicationDelegate* delegate = [[AtomApplicationDelegate alloc] init]; [NSApp setDelegate:(id)delegate]; - base::FilePath frameworkPath = brightray::MainApplicationBundlePath() - .Append("Contents") - .Append("Frameworks") - .Append(ATOM_PRODUCT_NAME " Framework.framework"); - NSBundle* frameworkBundle = [NSBundle - bundleWithPath:base::mac::FilePathToNSString(frameworkPath)]; + NSBundle* frameworkBundle = base::mac::FrameworkBundle(); NSNib* mainNib = [[NSNib alloc] initWithNibNamed:@"MainMenu" bundle:frameworkBundle]; [mainNib instantiateWithOwner:application topLevelObjects:nil];