| Index: chrome/browser/chrome_browser_main_mac.mm
|
| diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
|
| index b1b4989da0f25832474d252ff3de60c79f94afce..156146bae1ec5e9e2e4041ebe1dd4ea36c3b1858 100644
|
| --- a/chrome/browser/chrome_browser_main_mac.mm
|
| +++ b/chrome/browser/chrome_browser_main_mac.mm
|
| @@ -12,7 +12,7 @@
|
| #include "base/files/file_path.h"
|
| #include "base/mac/bundle_locations.h"
|
| #include "base/mac/mac_util.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/path_service.h"
|
| #include "chrome/app/breakpad_mac.h"
|
| @@ -265,9 +265,9 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
|
| }
|
|
|
| // Now load the nib (from the right bundle).
|
| - scoped_nsobject<NSNib>
|
| - nib([[NSNib alloc] initWithNibNamed:@"MainMenu"
|
| - bundle:base::mac::FrameworkBundle()]);
|
| + base::scoped_nsobject<NSNib> nib(
|
| + [[NSNib alloc] initWithNibNamed:@"MainMenu"
|
| + 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];
|
|
|