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

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: Fix ash_unittests 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/base_layout_manager_unittest.cc ('k') | ash/wm/panel_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 112a97ed4fe2b697810b20dc7c1ddf5d398f7142..25d3a4dcea3a377590549efea307dc89751a3893 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;
}
« no previous file with comments | « ash/wm/base_layout_manager_unittest.cc ('k') | ash/wm/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698