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

Unified Diff: base/mac/mac_util.mm

Issue 9240004: Transition to base/mac/bundle_locations.h step 3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 | « no previous file | chrome/browser/mac/install_from_dmg.mm » ('j') | chrome/browser/shell_integration_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/mac/mac_util.mm
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index 2ba1a3031789ee737b4353315d9f498f0e1f268d..592e8cd6b1b6ad6c15b53fdd9b63a4a7239ff5e5 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -10,6 +10,7 @@
#include "base/file_path.h"
#include "base/logging.h"
+#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_nsobject.h"
@@ -72,7 +73,7 @@ LSSharedFileListItemRef GetLoginItemForApp() {
scoped_nsobject<NSArray> login_items_array(
CFToNSCast(LSSharedFileListCopySnapshot(login_items, NULL)));
- NSURL* url = [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]];
+ NSURL* url = [NSURL fileURLWithPath:[base::mac::MainBundle() bundlePath]];
for(NSUInteger i = 0; i < [login_items_array count]; ++i) {
LSSharedFileListItemRef item = reinterpret_cast<LSSharedFileListItemRef>(
@@ -416,7 +417,7 @@ void AddToLoginItems(bool hide_on_startup) {
LSSharedFileListItemRemove(login_items, item);
}
- NSURL* url = [NSURL fileURLWithPath:[[NSBundle mainBundle] bundlePath]];
+ NSURL* url = [NSURL fileURLWithPath:[base::mac::MainBundle() bundlePath]];
BOOL hide = hide_on_startup ? YES : NO;
NSDictionary* properties =
« no previous file with comments | « no previous file | chrome/browser/mac/install_from_dmg.mm » ('j') | chrome/browser/shell_integration_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698