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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/shell_browser_main_parts.h" 5 #include "content/shell/shell_browser_main_parts.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/mac/bundle_locations.h" 9 #include "base/mac/bundle_locations.h"
10 #include "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "content/shell/shell_application_mac.h" 11 #include "content/shell/shell_application_mac.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 void ShellBrowserMainParts::PreMainMessageLoopStart() { 15 void ShellBrowserMainParts::PreMainMessageLoopStart() {
16 // Force the NSApplication subclass to be used. 16 // Force the NSApplication subclass to be used.
17 [ShellCrApplication sharedApplication]; 17 [ShellCrApplication sharedApplication];
18 18
19 scoped_nsobject<NSNib> 19 base::scoped_nsobject<NSNib> nib(
20 nib([[NSNib alloc] initWithNibNamed:@"MainMenu" 20 [[NSNib alloc] initWithNibNamed:@"MainMenu"
21 bundle:base::mac::FrameworkBundle()]); 21 bundle:base::mac::FrameworkBundle()]);
22 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil]; 22 [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];
23 } 23 }
24 24
25 } // namespace content 25 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698