Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Unified Diff: content/shell/shell_browser_main_parts_mac.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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];
}

Powered by Google App Engine
This is Rietveld 408576698