Revert r128507 "Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-aft…

ash/shell.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/shell.h"
 
 #include <algorithm>
 
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
@@ skipping 72 matching lines @@
 #include "ui/ui_controls/ui_controls.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
 #if !defined(OS_MACOSX)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
 #include "ash/accelerators/nested_dispatcher_controller.h"
 #endif
 
+#if defined(USE_X11)
+#include "ui/aura/monitor_change_observer_x11.h"
+#endif
+
 namespace ash {
 
 namespace {
 
 using aura::Window;
 using views::Widget;
 
 // Creates a new window for use as a container.
 aura::Window* CreateContainer(int window_id,
                               const char* name,
@@ skipping 418 matching lines @@
   RemoveRootWindowEventFilter(tooltip_controller_.get());
   aura::client::SetTooltipClient(GetRootWindow(), NULL);
 
   // Make sure we delete WorkspaceController before launcher is
   // deleted as it has a reference to launcher model.
   workspace_controller_.reset();
 
   // The system tray needs to be reset before all the windows are destroyed.
   tray_.reset();
 
+  // Desroy secondary monitor's widgets before all the windows are destroyed.
+  monitor_controller_.reset();
+
   // Delete containers now so that child windows does not access
   // observers when they are destructed.
   aura::RootWindow* root_window = GetRootWindow();
   while (!root_window->children().empty()) {
     aura::Window* child = root_window->children()[0];
     delete child;
   }
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
@@ skipping 13 matching lines @@
 
   DCHECK(instance_ == this);
   instance_ = NULL;
 }
 
 // static
 Shell* Shell::CreateInstance(ShellDelegate* delegate) {
   CHECK(!instance_);
   aura::Env::GetInstance()->SetMonitorManager(
       new internal::MultiMonitorManager());
+#if defined(USE_X11)
+  aura::Env::GetInstance()->monitor_change_observer()->NotifyMonitorChange();
+#endif
   instance_ = new Shell(delegate);
   instance_->Init();
   return instance_;
 }
 
 // static
 Shell* Shell::GetInstance() {
   DCHECK(instance_);
   return instance_;
 }
@@ skipping 290 matching lines @@
   desktop_background_controller_->SetDesktopBackgroundImageMode(
       GetWallpaper(index), GetWallpaperInfo(index).layout);
 }
 
 void Shell::DisableWorkspaceGridLayout() {
   if (workspace_controller_.get())
     workspace_controller_->workspace_manager()->set_grid_size(0);
 }
 
 }  // namespace ash