Revert 151293 - Makes Window not change focus and send out notifications when moving

ui/aura/window.cc

Index: ui/aura/window.cc
===================================================================
--- ui/aura/window.cc	(revision 151297)
+++ ui/aura/window.cc	(working copy)
@@ -349,12 +349,10 @@
 }
 
 void Window::AddChild(Window* child) {
-  RootWindow* old_root = child->GetRootWindow();
-
   DCHECK(std::find(children_.begin(), children_.end(), child) ==
       children_.end());
   if (child->parent())
-    child->parent()->RemoveChildImpl(child, this);
+    child->parent()->RemoveChild(child);
   child->parent_ = this;
 
   layer_->Add(child->layer_);
@@ -365,8 +363,8 @@
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowAdded(child));
   child->OnParentChanged();
 
-  RootWindow* root_window = GetRootWindow();
-  if (root_window && old_root != root_window) {
+  RootWindow* root_window = child->GetRootWindow();
+  if (root_window) {
     root_window->OnWindowAddedToRootWindow(child);
     child->NotifyAddedToRootWindow();
   }
@@ -391,7 +389,26 @@
 }
 
 void Window::RemoveChild(Window* child) {
-  RemoveChildImpl(child, NULL);
+  Windows::iterator i = std::find(children_.begin(), children_.end(), child);
+  DCHECK(i != children_.end());
+  if (layout_manager_.get())
+    layout_manager_->OnWillRemoveWindowFromLayout(child);
+  FOR_EACH_OBSERVER(WindowObserver, observers_, OnWillRemoveWindow(child));
+  RootWindow* root_window = child->GetRootWindow();
+  if (root_window) {
+    root_window->OnWindowRemovedFromRootWindow(child);
+    child->NotifyRemovingFromRootWindow();
+  }
+  child->parent_ = NULL;
+  // We should only remove the child's layer if the child still owns that layer.
+  // Someone else may have acquired ownership of it via AcquireLayer() and may
+  // expect the hierarchy to go unchanged as the Window is destroyed.
+  if (child->layer_owner_.get())
+    layer_->Remove(child->layer_);
+  children_.erase(i);
+  child->OnParentChanged();
+  if (layout_manager_.get())
+    layout_manager_->OnWindowRemovedFromLayout(child);
 }
 
 bool Window::Contains(const Window* other) const {
@@ -759,30 +776,6 @@
   return delegate_ ? this : NULL;
 }
 
-void Window::RemoveChildImpl(Window* child, Window* new_parent) {
-  Windows::iterator i = std::find(children_.begin(), children_.end(), child);
-  DCHECK(i != children_.end());
-  if (layout_manager_.get())
-    layout_manager_->OnWillRemoveWindowFromLayout(child);
-  FOR_EACH_OBSERVER(WindowObserver, observers_, OnWillRemoveWindow(child));
-  RootWindow* root_window = child->GetRootWindow();
-  if (root_window &&
-      (!new_parent || new_parent->GetRootWindow() != root_window)) {
-    root_window->OnWindowRemovedFromRootWindow(child);
-    child->NotifyRemovingFromRootWindow();
-  }
-  child->parent_ = NULL;
-  // We should only remove the child's layer if the child still owns that layer.
-  // Someone else may have acquired ownership of it via AcquireLayer() and may
-  // expect the hierarchy to go unchanged as the Window is destroyed.
-  if (child->layer_owner_.get())
-    layer_->Remove(child->layer_);
-  children_.erase(i);
-  child->OnParentChanged();
-  if (layout_manager_.get())
-    layout_manager_->OnWindowRemovedFromLayout(child);
-}
-
 void Window::OnParentChanged() {
   FOR_EACH_OBSERVER(
       WindowObserver, observers_, OnWindowParentChanged(this, parent_));