[WIP] ui/window: Master CL.

ui/aura/env.cc

Index: ui/aura/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index f701695738958abcfa6dd6e4753e31cf068fc7be..776f6fe0e3678e22cfea3d6a74c8d19683e652af 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -10,6 +10,10 @@
 #include "ui/events/event_target_iterator.h"
 #include "ui/events/platform/platform_event_source.h"
 
+#if defined(USE_OZONE)
+#include "ui/ozone/ozone_platform.h"
+#endif
+
 namespace aura {
 
 // static
@@ -70,6 +74,10 @@ bool Env::IsMouseButtonDown() const {
 void Env::Init() {
   ui::Compositor::Initialize();
 
+#if defined(USE_OZONE)
+  ui::OzonePlatform::Initialize();
+#endif
+
   if (!ui::PlatformEventSource::GetInstance())
     event_source_ = ui::PlatformEventSource::CreateDefault();
 }