summaryrefslogtreecommitdiffstats
path: root/ui/aura/env.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura/env.cc')
-rw-r--r--ui/aura/env.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 0e9222c..32ead2b 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -9,6 +9,10 @@
#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
@@ -20,9 +24,11 @@ Env* Env::instance_ = NULL;
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