| Index: ash/shell/shell_main_parts_mac.mm
|
| diff --git a/ash/shell/shell_main_parts_mac.mm b/ash/shell/shell_main_parts_mac.mm
|
| index d5c726ef0ad5ae2ad0dced109214271537d9bb06..292e1d5ff89bf54e84243cab9742c5f4ed8fc3b0 100644
|
| --- a/ash/shell/shell_main_parts_mac.mm
|
| +++ b/ash/shell/shell_main_parts_mac.mm
|
| @@ -8,7 +8,7 @@
|
|
|
| #include "base/i18n/icu_util.h"
|
| #include "base/mac/bundle_locations.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
|
|
| @@ -20,9 +20,9 @@ void PreMainMessageLoopStart() {
|
| icu_util::Initialize();
|
| ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
|
|
|
| - 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()]);
|
| [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];
|
| }
|
|
|
|
|