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

ui/aura/env.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/env.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/single_monitor_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/compositor/compositor.h"
 
+#if defined(USE_X11)
+#include "ui/aura/monitor_change_observer_x11.h"
+#endif
+
 namespace aura {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
 Env::Env()
     : mouse_button_flags_(0),
       stacking_client_(NULL),
-      monitor_manager_(NULL)
+      monitor_manager_(new internal::SingleMonitorManager)
+#if defined(USE_X11)
+    , monitor_change_observer_(new MonitorChangeObserverX11())
+#endif
 {
-  SetMonitorManager(new internal::SingleMonitorManager());
 #if !defined(OS_MACOSX)
   dispatcher_.reset(CreateDispatcher());
 #endif
   ui::Compositor::Initialize(false);
 }
 
 Env::~Env() {
   ui::Compositor::Terminate();
 }
 
@@ skipping 29 matching lines @@
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 }  // namespace aura