Desktop aura: Break aura::Window::SetParent in two.

ash/wm/gestures/long_press_affordance_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/gestures/long_press_affordance_handler.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell_window_ids.h"
@@ skipping 50 matching lines @@
 views::Widget* CreateAffordanceWidget(aura::RootWindow* root_window) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.keep_on_top = true;
   params.accept_events = false;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   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;
 }
 
 void PaintAffordanceArc(gfx::Canvas* canvas,
                         gfx::Point& center,
                         int radius,
                         int start_angle,
                         int end_angle) {
   SkPaint paint;
   paint.setStyle(SkPaint::kStroke_Style);
@@ skipping 285 matching lines @@
     default:
       view_.reset();
       tap_down_touch_id_ = -1;
       tap_down_display_id_ = 0;
       break;
   }
 }
 
 }  // namespace internal
 }  // namespace ash