Enable Virtual Screen Coordinates

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/display/display_controller.h"
 #include "ash/shell.h"
@@ skipping 56 matching lines @@
     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 (internal::SystemModalContainerLayoutManager::IsModalScreen(window))
         continue;
 
       // Update the restore bounds to make it relative to the display.
-      gfx::Rect restore_bounds;
-      if (internal::DisplayController::IsVirtualScreenCoordinatesEnabled())
-        restore_bounds = GetRestoreBoundsInParent(window);
+      gfx::Rect restore_bounds(GetRestoreBoundsInParent(window));
       dst_container->AddChild(window);
       if (!restore_bounds.IsEmpty())
         SetRestoreBoundsInParent(window, restore_bounds);
     }
   }
 }
 
 // Mark the container window so that a widget added to this container will
 // use the virtual screeen coordinates instead of parent.
 void SetUsesScreenCoordinates(aura::Window* container) {
@@ skipping 143 matching lines @@
 
 RootWindowController::RootWindowController(aura::RootWindow* root_window)
     : root_window_(root_window) {
   SetRootWindowController(root_window, this);
 
   event_client_.reset(new internal::EventClientImpl(root_window));
   screen_dimmer_.reset(new internal::ScreenDimmer(root_window));
 }
 
 RootWindowController::~RootWindowController() {
+  if (Shell::GetActiveRootWindow() == root_window_.get()) {
+    Shell::GetInstance()->set_active_root_window(
+        Shell::GetPrimaryRootWindow() == root_window_.get() ?
+        NULL : Shell::GetPrimaryRootWindow());
+  }
   SetRootWindowController(root_window_.get(), NULL);
   event_client_.reset();
   screen_dimmer_.reset();
   workspace_controller_.reset();
   root_window_.reset();
 }
 
 aura::Window* RootWindowController::GetContainer(int container_id) {
   return root_window_->GetChildById(container_id);
 }
@@ skipping 57 matching lines @@
   // Restore focused or active window if it's still alive.
   if (focused && tracker.Contains(focused) && dst->Contains(focused)) {
     dst->GetFocusManager()->SetFocusedWindow(focused, NULL);
   } else if (active && tracker.Contains(active) && dst->Contains(active)) {
     activation_client->ActivateWindow(active);
   }
 }
 
 }  // namespace internal
 }  // namespace ash