Revert 197501 "Merge 195552 "Restore focus/activation after the ..."

ash/root_window_controller.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/root_window_controller.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 18 matching lines @@
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_background_controller.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/command_line.h"
 #include "base/time.h"
+#include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/capture_client.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/tooltip_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
+#include "ui/aura/window_tracker.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/corewm/visibility_controller.h"
 #include "ui/views/view_model.h"
 #include "ui/views/view_model_utils.h"
 
 namespace ash {
@@ skipping 323 matching lines @@
 
   while (!root_window_->children().empty()) {
     aura::Window* child = root_window_->children()[0];
     delete child;
   }
 
   shelf_.reset(NULL);
 }
 
 void RootWindowController::MoveWindowsTo(aura::RootWindow* dst) {
+  aura::Window* focused = aura::client::GetFocusClient(dst)->GetFocusedWindow();
+  aura::WindowTracker tracker;
+  if (focused)
+    tracker.Add(focused);
+  aura::client::ActivationClient* activation_client =
+      aura::client::GetActivationClient(dst);
+  aura::Window* active = activation_client->GetActiveWindow();
+  if (active && focused != active)
+    tracker.Add(active);
+  // Deactivate the window to close menu / bubble windows.
+  activation_client->DeactivateWindow(active);
+  // Release capture if any.
+  aura::client::GetCaptureClient(root_window_.get())->
+      SetCapture(NULL);
+  // Clear the focused window if any. This is necessary because a
+  // window may be deleted when losing focus (fullscreen flash for
+  // example).  If the focused window is still alive after move, it'll
+  // be re-focused below.
+  aura::client::GetFocusClient(dst)->FocusWindow(NULL);
+
   // Forget the shelf early so that shelf don't update itself using wrong
   // display info.
   workspace_controller_->SetShelf(NULL);
+
   ReparentAllWindows(root_window_.get(), dst);
+
+  // Restore focused or active window if it's still alive.
+  if (focused && tracker.Contains(focused) && dst->Contains(focused)) {
+    aura::client::GetFocusClient(dst)->FocusWindow(focused);
+  } else if (active && tracker.Contains(active) && dst->Contains(active)) {
+    activation_client->ActivateWindow(active);
+  }
 }
 
 ShelfLayoutManager* RootWindowController::GetShelfLayoutManager() {
   return shelf_.get() ? shelf_->shelf_layout_manager() : NULL;
 }
 
 SystemTray* RootWindowController::GetSystemTray() {
   // We assume in throughout the code that this will not return NULL. If code
   // triggers this for valid reasons, it should test status_area_widget first.
   CHECK(shelf_.get() && shelf_->status_area_widget());
@@ skipping 197 matching lines @@
       "OverlayContainer",
       lock_screen_related_containers);
   SetUsesScreenCoordinates(overlay_container);
 
   CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
                   "PowerButtonAnimationContainer", root_window) ;
 }
 
 }  // namespace internal
 }  // namespace ash