Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: ui/views/mus/mus_client.cc

Issue 2488353005: Implement aura::PropertyConverter for mus interop. (Closed)
Patch Set: Remove key name comparison. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 1f093fbf8f5526bbafff016f70034f5fdb13150f..cc3e24f24253e08a030b29f24a77ef0b7db7509e 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -28,36 +28,6 @@
#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;
@@ -106,7 +76,8 @@ MusClient::MusClient(service_manager::Connector* connector,
: 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>();
« no previous file with comments | « ui/aura/window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698