move windows when disconnecting secondary monitors

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 "ash/shell.h"
 #include "ash/shell_factory.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/base_layout_manager.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_filter.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ash/wm/workspace_controller.h"
+#include "ui/aura/client/activation_client.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/tooltip_client.h"
+#include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
+#include "ui/views/controls/menu/menu_controller.h"
 
 namespace ash {
 namespace {
 
 // Creates a new window for use as a container.
 aura::Window* CreateContainer(int window_id,
                               const char* name,
                               aura::Window* parent) {
   aura::Window* container = new aura::Window(NULL);
   container->set_id(window_id);
   container->SetName(name);
   container->Init(ui::LAYER_NOT_DRAWN);
   parent->AddChild(container);
   if (window_id != internal::kShellWindowId_UnparentedControlContainer)
     container->Show();
   return container;
 }
 
+void MoveAllWindows(aura::RootWindow* src,
+                    aura::RootWindow* dst,
+                    const int* ids,

[Daniel Erat, 2012/06/25 22:09:33]

nit: mind switching this to be a reference to a vector<int>?  it feels a bit
cleaner and i think it'll actually save you a line on the MoveWindowsTo() side.

also, please rename to something like container_ids.

[oshima, 2012/06/25 22:42:28]

move container_ids from caller to callee because this is just a utility
function.

+                    size_t size) {
+  for (size_t i = 0; i < size; i++) {
+    int id = ids[i];
+    aura::Window* src_container = Shell::GetContainer(src, id);
+    aura::Window* dst_container = Shell::GetContainer(dst, id);
+    aura::Window::Windows children = src_container->children();
+    for (aura::Window::Windows::iterator iter = children.begin();
+         iter != children.end(); ++iter) {
+      aura::Window* window = *iter;
+      // Don't move modal screen.
+      if ((id == internal::kShellWindowId_SystemModalContainer ||
+           id == internal::kShellWindowId_LockSystemModalContainer) &&
+          window->GetProperty(aura::client::kModalKey) == ui::MODAL_TYPE_NONE) {
+        continue;
+      }
+      dst_container->AddChild(window);
+    }
+  }
+}
+
 // Creates each of the special window containers that holds windows of various
 // types in the shell UI.
 void CreateContainersInRootWindow(aura::RootWindow* root_window) {
   // These containers are just used by PowerButtonController to animate groups
   // of containers simultaneously without messing up the current transformations
   // on those containers.  These are direct children of the root window; all of
   // the other containers are their children.
   aura::Window* non_lock_screen_containers = CreateContainer(
       internal::kShellWindowId_NonLockScreenContainersContainer,
       "NonLockScreenContainersContainer",
@@ skipping 157 matching lines @@
   while (!root_window_->children().empty()) {
     aura::Window* child = root_window_->children()[0];
     delete child;
   }
 }
 
 bool RootWindowController::IsInMaximizedMode() const {
   return workspace_controller_->workspace_manager()->IsInMaximizedMode();
 }
 
+void RootWindowController::MoveWindowsTo(aura::RootWindow* dst) {
+  aura::Window* focused = dst->GetFocusManager()->GetFocusedWindow();
+  aura::client::ActivationClient* activation_client =
+      aura::client::GetActivationClient(dst);
+  aura::Window* active = activation_client->GetActiveWindow();
+  // Deactivate the window to close menu / bubble windows.
+  if (root_window_->Contains(focused) || root_window_->Contains(active))

[oshima, 2012/06/25 22:42:28]

I removed this and changed to always deactivate because I want to close any
menu/bubble windows to simplify the transition.
active window should be restored at the end of this function if any.

+    activation_client->DeactivateWindow(active);
+  // Close context menu on desktop.
+  views::MenuController* menu_controller =
+      views::MenuController::GetActiveInstance();
+  if (menu_controller)
+    menu_controller->OnWidgetActivationChanged();

[sky, 2012/06/25 22:05:14]

Why do you have to explicitly do this? Doesn't the deactivation handle it for
you?

[oshima, 2012/06/25 22:42:28]

A desktop context menu can be opened without activation and this necessar to
close such context menu.

[sky, 2012/06/25 23:58:33]

I don't like the direct dependency. Some event should be triggered that
MenuController can listen for and hide itself.

+
+  // Windows moves only from secondary displays to the primary

[Daniel Erat, 2012/06/25 22:09:33]

nit: s/moves/move/

[oshima, 2012/06/25 22:42:28]

Done.

+  // display, so no need to move windows in the containers that are
+  // available only in the primary display (launcher, panels etc)
+  int copy_layers[] = {
+    internal::kShellWindowId_DefaultContainer,
+    internal::kShellWindowId_AlwaysOnTopContainer,
+    internal::kShellWindowId_SystemModalContainer,
+    internal::kShellWindowId_LockSystemModalContainer,
+  };
+  MoveAllWindows(root_window_.get(), dst, copy_layers, arraysize(copy_layers));
+  // Restore focused / active window.
+  if (focused) {
+    DCHECK(dst->Contains(focused));
+    dst->GetFocusManager()->SetFocusedWindow(focused, NULL);
+  } else if (active) {

[Daniel Erat, 2012/06/25 22:09:33]

will focusing the window automatically update activation?

[oshima, 2012/06/25 22:42:28]

Yes. this is "else if" , in case there is an active window without focus. (don't
have an example, but it's technically possible.)

+    DCHECK(dst->Contains(active));
+    activation_client->ActivateWindow(active);
+  }
+}
+
 }  // namespace internal
 }  // namespace ash