ui/views/widget/native_widget_mac.mm - Issue 1063933003: MacViews: Allow views::Widgets to be parented off NSWindows

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: ui/views/widget/native_widget_mac.mm

Issue 1063933003: MacViews: Allow views::Widgets to be parented off NSWindows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150401-MacViews-AppInfo-Standalone

Patch Set: fix gyp Created 5 years, 7 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

« ui/views/cocoa/widget_owner_nswindow_adapter.mm ('K') | « ui/views/views.gyp ('k') | ui/views/widget/native_widget_mac_unittest.mm » ('j') | ui/views/widget/native_widget_mac_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/widget/native_widget_mac.mm

diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm

index 10a1c9f7475a336beebc5d09e4fb5849a64a3520..bd6061f6dfa33b383861851e4dde80db06bea4f9 100644

--- a/ui/views/widget/native_widget_mac.mm

+++ b/ui/views/widget/native_widget_mac.mm

@@ -581,13 +581,13 @@ NativeWidgetPrivate* NativeWidgetPrivate::GetTopLevelNativeWidget(

BridgedNativeWidget* bridge =

NativeWidgetMac::GetBridgeForNativeWindow([native_view window]);

if (!bridge)

- return NULL;

+ return nullptr;

- for (BridgedNativeWidget* parent;

- (parent = bridge->parent());

- bridge = parent) {

- }

- return bridge->native_widget_mac();

+ NativeWidgetPrivate* ancestor =

+ bridge->parent() ? GetTopLevelNativeWidget(

+ [bridge->parent()->GetNSWindow() contentView])

+ : nullptr;

+ return ancestor ? ancestor : bridge->native_widget_mac();

}

// static