content/shell/browser/shell_browser_main_parts_mac.mm - Issue 2116103002: mac: Use instantiateWithOwner: instead of deprecated instantiateNibWithOwner:

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/browser/shell_browser_main_parts_mac.mm

Issue 2116103002: mac: Use instantiateWithOwner: instead of deprecated instantiateNibWithOwner: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: be more thrifty with newlines Created 4 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/browser/shell_browser_main_parts_mac.mm

diff --git a/content/shell/browser/shell_browser_main_parts_mac.mm b/content/shell/browser/shell_browser_main_parts_mac.mm

index a933705bf1606841a6eefc2ff030b0c96d15ee22..f918d34686e7e8dba8d81e1910f49fa783118634 100644

--- a/content/shell/browser/shell_browser_main_parts_mac.mm

+++ b/content/shell/browser/shell_browser_main_parts_mac.mm

@@ -8,6 +8,7 @@

#include "base/mac/bundle_locations.h"

#include "base/mac/scoped_nsobject.h"

+#include "base/mac/sdk_forward_declarations.h"

#include "content/shell/browser/shell_application_mac.h"

namespace content {

@@ -19,7 +20,10 @@ void ShellBrowserMainParts::PreMainMessageLoopStart() {

base::scoped_nsobject<NSNib> nib(

[[NSNib alloc] initWithNibNamed:@"MainMenu"

bundle:base::mac::FrameworkBundle()]);

- [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];

+ NSArray* top_level_objects = nil;

+ [nib instantiateWithOwner:NSApp topLevelObjects:nil];

+ for (NSObject* object : top_level_objects)

+ [object retain];

Avi (use Gerrit) 2016/07/01 22:23:54 Is [top_level_objects makeObjectsPerformSelector:

}

} // namespace content

« chrome/browser/chrome_browser_main_mac.mm ('K') | « chrome/browser/chrome_browser_main_mac.mm ('k') | ui/base/cocoa/nib_loading.mm » ('j') | no next file with comments »