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

Unified Diff: ui/views/widget/native_widget_mac.mm

Issue 588113002: Change Widget::GetAllOwnedWidgets to return child widgets as well (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@aid_resilient_to_uninstall_and_profile_changes
Patch Set: Merged GetAllChildWidgets and GetAllOwnedWidgets Created 6 years, 2 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: 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 b6aa7176a1163772804329ac8577fa0cf8146f31..7e8b17b4e086a4e4c47686f5f04c8c3fc0565230 100644
--- a/ui/views/widget/native_widget_mac.mm
+++ b/ui/views/widget/native_widget_mac.mm
@@ -592,25 +592,20 @@ NativeWidgetPrivate* NativeWidgetPrivate::GetTopLevelNativeWidget(
}
// static
-void NativeWidgetPrivate::GetAllChildWidgets(gfx::NativeView native_view,
- Widget::Widgets* children) {
+void NativeWidgetPrivate::GetAllChildAndOwnedWidgets(
+ gfx::NativeView native_view,
+ Widget::Widgets* widgets) {
NativeWidgetPrivate* native_widget =
GetNativeWidgetForNativeView(native_view);
if (!native_widget)
return;
- // Code expects widget for |native_view| to be added to |children|.
+ // Code expects widget for |native_view| to be added to |widgets|.
if (native_widget->GetWidget())
- children->insert(native_widget->GetWidget());
+ widgets->insert(native_widget->GetWidget());
for (NSWindow* child_window : [native_widget->GetNativeWindow() childWindows])
- GetAllChildWidgets([child_window contentView], children);
-}
-
-// static
-void NativeWidgetPrivate::GetAllOwnedWidgets(gfx::NativeView native_view,
- Widget::Widgets* owned) {
- NOTIMPLEMENTED();
+ GetAllChildAndOwnedWidgets([child_window contentView], widgets);
}
// static

Powered by Google App Engine
This is Rietveld 408576698