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

ui/aura/env.h

Index: ui/aura/env.h
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 5f6ff6a1a5f02160efe7fb7fc22d2c1548deb041..4089bff79c877fba5c18e1a504ccf5cafa059a40 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -15,6 +15,7 @@
 namespace aura {
 
 class EnvObserver;
+class MonitorChangeObserverX11;
 class MonitorManager;
 class Window;
 
@@ -51,6 +52,12 @@ class AURA_EXPORT Env {
     stacking_client_ = stacking_client;
   }
 
+#if defined(USE_X11)
+  MonitorChangeObserverX11* monitor_change_observer() {
+    return monitor_change_observer_.get();
+  }
+#endif
+
   // Gets/sets MonitorManager. The MonitorManager's ownership is
   // transfered.
   MonitorManager* monitor_manager() { return monitor_manager_.get(); }
@@ -80,6 +87,10 @@ class AURA_EXPORT Env {
   client::StackingClient* stacking_client_;
   scoped_ptr<MonitorManager> monitor_manager_;
 
+#if defined(USE_X11)
+  scoped_ptr<MonitorChangeObserverX11> monitor_change_observer_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(Env);
 };