Index: content/shell/shell_browser_main_parts_mac.mm |
diff --git a/content/shell/shell_browser_main_parts_mac.mm b/content/shell/shell_browser_main_parts_mac.mm |
index 687c161b21af360754c65bb7da20a84953185d41..b2b84b746f5f7a5ec706a6f910faf06a9d5f7287 100644 |
--- a/content/shell/shell_browser_main_parts_mac.mm |
+++ b/content/shell/shell_browser_main_parts_mac.mm |
@@ -7,7 +7,7 @@ |
#import <Cocoa/Cocoa.h> |
#include "base/mac/bundle_locations.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "content/shell/shell_application_mac.h" |
namespace content { |
@@ -16,9 +16,9 @@ void ShellBrowserMainParts::PreMainMessageLoopStart() { |
// Force the NSApplication subclass to be used. |
[ShellCrApplication sharedApplication]; |
- 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]; |
} |