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

ui/aura/single_monitor_manager.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 "ui/aura/single_monitor_manager.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/monitor.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 namespace internal {
 
 using std::string;
 
 namespace {
 // Default bounds for the primary monitor.
 static const int kDefaultHostWindowX = 200;
 static const int kDefaultHostWindowY = 200;
 static const int kDefaultHostWindowWidth = 1280;
 static const int kDefaultHostWindowHeight = 1024;
 }
 
 SingleMonitorManager::SingleMonitorManager()
-    : root_window_(NULL),
-      monitor_(new Monitor()) {
+    : root_window_(NULL) {
   Init();
 }
 
 SingleMonitorManager::~SingleMonitorManager() {
-  if (root_window_)
-    root_window_->RemoveObserver(this);
+  // All monitors must have been deleted when monitor manager is deleted.
+  CHECK(!root_window_);
 }
 
-void SingleMonitorManager::OnNativeMonitorResized(const gfx::Size& size) {
+void SingleMonitorManager::OnNativeMonitorsChanged(
+    const std::vector<const Monitor*>& monitors) {
+  DCHECK(monitors.size() > 0);
   if (use_fullscreen_host_window()) {
-    monitor_->set_size(size);
+    monitor_->set_size(monitors[0]->bounds().size());
     NotifyBoundsChanged(monitor_.get());
   }
 }
 
 RootWindow* SingleMonitorManager::CreateRootWindowForMonitor(
     Monitor* monitor) {
   DCHECK(!root_window_);
   DCHECK_EQ(monitor_.get(), monitor);
   root_window_ = new RootWindow(monitor->bounds());
   root_window_->AddObserver(this);
@@ skipping 40 matching lines @@
       switches::kAuraHostWindowSize);
   monitor_.reset(CreateMonitorFromSpec(size_str));
 }
 
 void SingleMonitorManager::Update(const gfx::Size size) {
   monitor_->set_size(size);
 }
 
 }  // namespace inernal
 }  // namespace aura