Implement aura::PropertyConverter for mus interop.

ui/views/mus/mus_client.cc

 // Copyright 2016 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/views/mus/mus_client.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ skipping 10 matching lines @@
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/clipboard_mus.h"
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/screen_mus.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/wm_state.h"
 
 namespace views {
-namespace {
-
-// TODO: property converter should likely live in aura as it needs to be used
-// by both ash and views. http://crbug.com/663522.
-class PropertyConverterImpl : public aura::PropertyConverter {
- public:
-  PropertyConverterImpl() {}
-  ~PropertyConverterImpl() override {}
-
-  // aura::PropertyConverter:
-  bool ConvertPropertyForTransport(
-      aura::Window* window,
-      const void* key,
-      std::string* transport_name,
-      std::unique_ptr<std::vector<uint8_t>>* transport_value) override {
-    return false;
-  }
-  std::string GetTransportNameForPropertyKey(const void* key) override {
-    return std::string();
-  }
-  void SetPropertyFromTransportValue(
-      aura::Window* window,
-      const std::string& transport_name,
-      const std::vector<uint8_t>* transport_data) override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PropertyConverterImpl);
-};
-
-}  // namespace
 
 // static
 MusClient* MusClient::instance_ = nullptr;
 
 MusClient::~MusClient() {
   // ~WindowTreeClient calls back to us (we're its delegate), destroy it while
   // we are still valid.
   window_tree_client_.reset();
   ui::OSExchangeDataProviderFactory::SetFactory(nullptr);
   ui::Clipboard::DestroyClipboardForCurrentThread();
@@ skipping 28 matching lines @@
   }
   return native_widget;
 }
 
 MusClient::MusClient(service_manager::Connector* connector,
                      const service_manager::Identity& identity,
                      scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
     : connector_(connector), identity_(identity) {
   DCHECK(!instance_);
   instance_ = this;
-  property_converter_ = base::MakeUnique<PropertyConverterImpl>();
+  // TODO(msw): Avoid this... use some default value? Allow clients to extend?
+  property_converter_ = base::MakeUnique<aura::PropertyConverter>();
 
   wm_state_ = base::MakeUnique<wm::WMState>();
 
   gpu_service_ = aura::GpuService::Create(connector, std::move(io_task_runner));
   compositor_context_factory_ =
       base::MakeUnique<aura::MusContextFactory>(gpu_service_.get());
   aura::Env::GetInstance()->set_context_factory(
       compositor_context_factory_.get());
   window_tree_client_ =
       base::MakeUnique<aura::WindowTreeClient>(this, nullptr, nullptr);
@@ skipping 62 matching lines @@
       return root->GetTopWindowContainingPoint(relative_point);
   }
   return nullptr;
 }
 
 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace views