ash/wm/shelf_layout_manager_unittest.cc - Issue 11421006: Desktop aura: Break aura::Window::SetParent in two.

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: ash/wm/shelf_layout_manager_unittest.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: I think the content_unittests timeout on linux_aura is flake, but try to fix it anyway. Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/wm/shelf_layout_manager_unittest.cc

diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc

index 984ef6c2ebc8748a54a38df4292eb2ebd6b10e0b..fbf55ec6aeaffd82a278de21a9e8dc25c72f3070 100644

--- a/ash/wm/shelf_layout_manager_unittest.cc

+++ b/ash/wm/shelf_layout_manager_unittest.cc

@@ -170,7 +170,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase {

window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);

window->SetType(aura::client::WINDOW_TYPE_NORMAL);

window->Init(ui::LAYER_TEXTURED);

- window->SetParent(NULL);

+ AddToRootWindow(window);

return window;

}