Adds a porting layer so aura can be made to work with mus

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 "base/command_line.h"
 #include "base/lazy_instance.h"
+#include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/input_state_lookup.h"
+#include "ui/aura/window_port_local.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/events/platform/platform_event_source.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 namespace aura {
 
 namespace {
@@ skipping 14 matching lines @@
 // Env, public:
 
 Env::~Env() {
   for (EnvObserver& observer : observers_)
     observer.OnWillDestroyEnv();
   DCHECK_EQ(this, lazy_tls_ptr.Pointer()->Get());
   lazy_tls_ptr.Pointer()->Set(NULL);
 }
 
 // static
-std::unique_ptr<Env> Env::CreateInstance() {
+std::unique_ptr<Env> Env::CreateInstance(
+    const WindowPortFactory& window_port_factory) {
   DCHECK(!lazy_tls_ptr.Pointer()->Get());
-  std::unique_ptr<Env> env(new Env());
+  std::unique_ptr<Env> env(new Env(window_port_factory));
   env->Init();
   return env;
 }
 
 // static
 Env* Env::GetInstance() {
   Env* env = lazy_tls_ptr.Pointer()->Get();
   DCHECK(env) << "Env::CreateInstance must be called before getting the "
                  "instance of Env.";
   return env;
 }
 
 // static
 Env* Env::GetInstanceDontCreate() {
   return lazy_tls_ptr.Pointer()->Get();
 }
 
+std::unique_ptr<WindowPort> Env::CreateWindowPort(Window* window) {
+  if (window_port_factory_.is_null())
+    return base::MakeUnique<WindowPortLocal>(window);
+  return window_port_factory_.Run(window);
+}
+
 void Env::AddObserver(EnvObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void Env::RemoveObserver(EnvObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool Env::IsMouseButtonDown() const {
   return input_state_lookup_.get() ? input_state_lookup_->IsMouseButtonDown() :
       mouse_button_flags_ != 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
-Env::Env()
-    : mouse_button_flags_(0),
+Env::Env(const WindowPortFactory& window_port_factory)
+    : window_port_factory_(window_port_factory),
+      mouse_button_flags_(0),
       is_touch_down_(false),
       input_state_lookup_(InputStateLookup::Create()),
       context_factory_(NULL) {
   DCHECK(lazy_tls_ptr.Pointer()->Get() == NULL);
   lazy_tls_ptr.Pointer()->Set(this);
 }
 
 void Env::Init() {
   if (RunningInsideMus())
     return;
@@ skipping 36 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Env::GetChildIterator() const {
   return nullptr;
 }
 
 ui::EventTargeter* Env::GetEventTargeter() {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace aura