diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 07:59:08 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 07:59:08 +0000 |
| commit | a302ff0affd0d8a63acf872e740cd4e35ca379de (patch) | |
| tree | 7564ddadd22ca9670a9db36a679f1a3728f19663 /base/mac | |
| parent | 51c314d93e949d84cba31c471acf3e094148ce5a (diff) | |
| download | chromium_src-a302ff0affd0d8a63acf872e740cd4e35ca379de.zip chromium_src-a302ff0affd0d8a63acf872e740cd4e35ca379de.tar.gz chromium_src-a302ff0affd0d8a63acf872e740cd4e35ca379de.tar.bz2 | |
Transition to base/mac/bundle_locations.h step 3
Convert some instances of [NSBundle mainBundle] to equivalent calls in base/mac/bundle_locations.h
BUG=None
TEST=Code should compile and all unit tests should pass.
Review URL: http://codereview.chromium.org/9240004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/mac_util.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm index 2ba1a30..7c020e1 100644 --- a/base/mac/mac_util.mm +++ b/base/mac/mac_util.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -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 = |