Index: ui/aura/env.cc |
diff --git a/ui/aura/env.cc b/ui/aura/env.cc |
index 30b8b38ffc8951fe0f8329e1f19719cab72105d1..006400f9ebe625d5b0d3602a9776aba799e3dbd5 100644 |
--- a/ui/aura/env.cc |
+++ b/ui/aura/env.cc |
@@ -4,6 +4,7 @@ |
#include "ui/aura/env.h" |
#include "ui/aura/env_observer.h" |
+#include "ui/aura/monitor_manager.h" |
#include "ui/aura/root_window_host.h" |
#include "ui/aura/window.h" |
@@ -15,7 +16,11 @@ Env* Env::instance_ = NULL; |
//////////////////////////////////////////////////////////////////////////////// |
// Env, public: |
-Env::Env() : mouse_button_flags_(0), stacking_client_(NULL) { |
+Env::Env() |
+ : mouse_button_flags_(0), |
+ stacking_client_(NULL), |
+ monitor_manager_(NULL) |
+{ |
#if !defined(OS_MACOSX) |
dispatcher_.reset(CreateDispatcher()); |
#endif |
@@ -44,6 +49,10 @@ void Env::RemoveObserver(EnvObserver* observer) { |
observers_.RemoveObserver(observer); |
} |
+void Env::SetMonitorManager(MonitorManager* monitor_manager) { |
+ monitor_manager_.reset(monitor_manager); |
+} |
+ |
#if !defined(OS_MACOSX) |
MessageLoop::Dispatcher* Env::GetDispatcher() { |
return dispatcher_.get(); |