| Index: ui/views/test/widget_test_aura.cc
|
| diff --git a/ui/views/test/widget_test_aura.cc b/ui/views/test/widget_test_aura.cc
|
| index 8cabaf5cf256a5634350549cb3f7e8ccdf606520..2b4ac94b493e554ca27d0b7d1ef7298014696033 100644
|
| --- a/ui/views/test/widget_test_aura.cc
|
| +++ b/ui/views/test/widget_test_aura.cc
|
| @@ -71,7 +71,7 @@ BOOL CALLBACK FindAllWindowsCallback(HWND hwnd, LPARAM param) {
|
|
|
| #endif // OS_WIN
|
|
|
| -std::vector<aura::Window*> GetAllTopLeveLWindows() {
|
| +std::vector<aura::Window*> GetAllTopLevelWindows() {
|
| std::vector<aura::Window*> roots;
|
| #if defined(USE_X11) && !defined(OS_CHROMEOS)
|
| roots = DesktopWindowTreeHostX11::GetAllOpenWindows();
|
| @@ -163,10 +163,9 @@ bool WidgetTest::IsNativeWindowTransparent(gfx::NativeWindow window) {
|
|
|
| // static
|
| Widget::Widgets WidgetTest::GetAllWidgets() {
|
| - std::vector<aura::Window*> toplevel = GetAllTopLeveLWindows();
|
| Widget::Widgets all_widgets;
|
| - for (aura::Window* root : toplevel)
|
| - Widget::GetAllChildWidgets(root, &all_widgets);
|
| + for (aura::Window* window : GetAllTopLevelWindows())
|
| + Widget::GetAllChildWidgets(window->GetRootWindow(), &all_widgets);
|
| return all_widgets;
|
| }
|
|
|
|
|