ash/wm/gestures/long_press_affordance_handler.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/gestures/long_press_affordance_handler.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/gestures/long_press_affordance_handler.cc

diff --git a/ash/wm/gestures/long_press_affordance_handler.cc b/ash/wm/gestures/long_press_affordance_handler.cc

index f776e0122f0f9e50eb487b608db5ded6a961aa94..b8370a74b9df26c14640e0804997cd4c8d837294 100644

--- a/ash/wm/gestures/long_press_affordance_handler.cc

+++ b/ash/wm/gestures/long_press_affordance_handler.cc

@@ -68,9 +68,9 @@ views::Widget* CreateAffordanceWidget(aura::RootWindow* root_window) {

params.transparent = true;

widget->Init(params);

widget->SetOpacity(0xFF);

- widget->GetNativeWindow()->SetParent(

- ash::GetRootWindowController(root_window)->GetContainer(

- ash::internal::kShellWindowId_OverlayContainer));

+ ash::GetRootWindowController(root_window)->GetContainer(

+ ash::internal::kShellWindowId_OverlayContainer)->AddChild(

+ widget->GetNativeWindow());

return widget;

}