diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 14:59:07 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 14:59:07 +0000 |
| commit | 2f1804c7ecc4b4c8bb802dc518db9f3244b57e15 (patch) | |
| tree | 64584fe049e7b0381f142689eb934dae9eac8ad3 /chrome/browser/chrome_browser_main_mac.mm | |
| parent | e8315a4dca1a46363b91af21742bdb5d0eb0ceeb (diff) | |
| download | chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.zip chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.tar.gz chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.tar.bz2 | |
Transition to base/mac/bundle_locations.h step 2
Remove MainAppBundle() in favor of FrameworkBundle() and update all callsites + code comments.
BUG=None
TEST=Code should compile and all unit tests should pass.
Review URL: https://chromiumcodereview.appspot.com/9220005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_mac.mm')
| -rw-r--r-- | chrome/browser/chrome_browser_main_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm index b767e22..6743e864 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/file_path.h" +#include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/memory/scoped_nsobject.h" #include "base/path_service.h" @@ -96,7 +97,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() { // Now load the nib (from the right bundle). scoped_nsobject<NSNib> nib([[NSNib alloc] initWithNibNamed:@"MainMenu" - bundle:base::mac::MainAppBundle()]); + bundle:base::mac::FrameworkBundle()]); // TODO(viettrungluu): crbug.com/20504 - This currently leaks, so if you // change this, you'll probably need to change the Valgrind suppression. [nib instantiateNibWithOwner:NSApp topLevelObjects:nil]; |